Final update prior to reworking events.