Minor mods
Merging