some improvements to the pipeline
solves conflicts