Finalized edits