6-16 finished edits