improve #save