moving the events to event bus
moving the events to event bus