switched some code to match the structure of the base Router for easier future comparison.