More /SMS changes