updated tokenizers