next step is to fix agent references