undid a couple changes