ReCoded the event bus