made save and load correctly work