Add state saving pt2