My changes
Merging stuff