added options to use the live collected flock data
added hooks to do the avoidance