Added 1 and 2 solution