Edits from another reviewer.