Use autosave at the right place