switched to event bus based setup