Minor modifications after merge
MinimalOrder