Much reworking to get EventDct fixed.