more work on store/restore