First round of edits with GM