hopefully, final edits