re-added combiner, final changes
final changes (I promise)