Updated tokenizing