Changes to save/load.