final tokenize change