added avoidance.