Updated design for Pipeline