Final edits almost complete