Upgraded to pipes 4 and removed self-rolled stuff