Added single agent case