Overhaul of TSP classes (Verison 2.0)