Finished routing changes