Updated with combinations

Changed the is extened simple and is extended free choice with the itertools and set functions