Various changes
Merge conflict