changes in routing logic