Changed the logic for the tour