4th pass at #80

sorry i messed up and forgot something about the required state