Improvements to save