Another once over on the trade logic