Changing around some routing