A few changes
Merge