working on pipeline refactoring