ItemExchange some changes