Hamed alemo/fix pipeline