Updating docs
Updating event listeners