4th pass at #80

sorry i messed up and forgot to leave required state default