Make pipes better