Updated 1.10 solution.