Fixing up the router