updated with preferred text and edits