incorporated Carrie's suggestions