New version of Tokenizer