Changes for new flow of hike