Made some adjustments to pipeline, to make Marcs stuff work