almost done with edits