added eventbus source, fixed delay issue