Final edits for final submit