Implemented feedback from kathy