Final edits with comments