Small changes
Merging things