customized some of the routing