Change hardcoded piping to generic TWO command piping