Much cleaner new Router