Use OrderType
More update