Flock separation fix, WIP