Consolidate routing again