Responding to Dan's feedback.