Updates to latest Flocking.