wayback: switch to EventBus for events
wayback: switch to EventBus for events