redesign flocking system