tokenizer change fixes still