switching to new routing system