Edits in response to feedback.