Fixing the Pipeline