Upgraded OrderModel - added function