changes to work with new routing