Added working auto-save