Made a couple changes