big simplification of pipeline