Restructured solution.