Improvements

yerk.

What about emitting an event instead?