WIP: improving the pipeline