Ended of save and restore feature implementation