edits from Jennifer