add waypoint checking