Swarm and line fix