Partial rewrite of sms work