modified tokenizer