refactoring, adding work stage