change parse logic for event