updated Tokenizer