In progress on event sync