Final waypoint tuning