Made some routing changes