Merge pull request #27 from CothOmega/master

add my changes to garrett's state updates