AutoSave logic changed