3.8.6.2
* Changed listeners to work with the new events