Improve solution.