Reorganized solution.