more prep for state saving