changes to combinators