Updated with itinerary from master