Conforming minified version to commit "Implemented events"