Address Brad's feedback.