refactored routers