Are the code changes here forces by the new router functionality?