set up to work with new routing approach