fixing slow pipeline.