More restructuring of the solutions.