Braakman/fix pipeline