add forceSave logic