Changes based on Connie's feedback.