Making the tour a bit better