try to simplify save/restore instance state (still doesn’t work right)