Changed TradeOptions to allow for trade combinations