TradeController updated