updated tokenizer