switched to tokenizer usage