added avoidance