Reorganizing the solution