first round of edits