Improve tour implementation bit towards final goal.