Improvements to saving