Added 1.6 solution