Updated with Ellen's feedback.