fix audit and order refactoring