Tokenizer modified