Added yet more solutions