Saving waypoint passing work