edits up to discussion