made masterpipeline slightly more modular