add Saving and Loading
fix merge