Refactored orders modifications to simplify things later