Works with new version of EventRunner