WIP: synchronizing all events to better handle epoch change