Reorganization the solution