sms handler revamp