WIP 2: upgrade itinerary