change onSaveAndLoad to keep existing instance