Fixing up the routing