first pass of edits