hopefully final edits