Changed tokenizer