improved Pipe's inner workings