2017 itinerary includes Tokyo