Add waypoint check