new tokenization, some commands