Added vehicle avoidance.