final edits, for real this time