added 1.2 solution