Hopefully last edits of Tokenizer and Conditions