Added some state saving changes (to no avail)