Work on pipeline some more