Almost complete changes to the pipeline