Modifications in preparation for waypoints.