updated data events to match new template