Yaluwu/fix pipeline