added zone avoidance code
commit to merge
v2.4 aplha