make autosave work with new setup