Updated tokenizing
made twilio ready