Waypoint update & create fixed