hw4: fix pipeline better