Changing router to be more flexible.