More pipe changes