Working as expected, orders refactored