More work on trading events