Added a couple changes