comprehensive edits