changed tokenizer