edits together on June 28th