Updated router to reflect plan.