Edits from Jennifer's review