moved order comment code so only executed when there is an event in order