re-arrange for now to get complete waypoint list