Added 2.2 solution