Restored most functionality with new tokenized text.