Added collision avoidance