Updated to allow for different routers.