redid dad's changes
Merge pull request #2 from patricksurry/master

redo dad's changes