Added while to tokenizer