Updated for default event type