a couple changes
Merged conflicts