continue on refactoring production module