start changes for saving state