Commit old flocking changes