Added full pipe support
Removed unnecessary special case for final pipe