modified event emitters
:shipit: