More measurements and changes to capture the swarm state accurately