Reorganized into single solution.