Tweaked logic for state storer