Updated autosave solution