made some changes based on Erin's feedback