redo change
Merge pull request #379 from katiewood/master

redo change