tokenization changes