refactoring orders continues