4th pass at #80

sorry i messed up and forgot to leave required state default
Merge pull request #875 from gruiz17/patch-4

4th pass at #80