changed some of the routing