fix sms
structure change
Merge branch 'master' into lopv2