new pipeline, some fixes