Fixed state saving - now permanent