round 1 SM changes
Fixing merge conflicts