Flocking repairs (WIP)