Improved auto-save