updated design to fix agent selection issue