improved waypoint definition