Almost final edits