Pipe fix for new buffer model
Pipe minor update, still have issue