collision avoidance added, kind of...