Revert "using on instead of the events"

This reverts commit 37ec75dd239ff63ceb8bb93d440da60af4ed263f.