Fixing pipeline similar to how before