changed waypoint mechanism