edits, per feedback