Update to SS.Text re-factor