Addressing Alex's feedback.