Made the state remembering more sane