[DEV] Saving system is now more reliable