Cleaned up inspired-by pipes... -sai