Fixed all the routing