Edits based on Adam's feedback.