sm changes
merge