Improving the Save feature