Updated the routing