Updated 2-2 solution