Lot of fix to finish the trade handshake