implementing some of Bonnie's comments