Major reworking of routes