Added foldable sections and updated combiner to latest version