Save Solution Refactored