Convert to use new pipe stuff