Switched to events. Did we fix it?