changed saving system
merged