Now handles NearbyAgents properly