Updates to SMS from testing