Updated Waypoint Navigator