Take out handle multiple swarm, and change some checking