Works with new EventRunner