Incorporate Erik's feedback.