add my changes to garrett's state updates