implementing some feedback from greg