modifications in tokenizer