Edits
First round of edits based on feedback
Major edits