refactored orders as per conversion spec