A couple changes here and there