Updates based on Ivan and Jeanie's feedback