FINAL edits