changed the way the routing works