Restructured the solution.