resolving the conflictand proplems with order class

Issue #88 @jihan2032 @ZzimBoo91 @omartarek @attwa @lotfy1893