Modified Phase-1 waypoints