Address Christina's and Dan's feedback.