More work on the new pipe model.