more work on pipe addons