Finalized the order management