Update

* Rewritten new event
* removed out of scope/overwrite events for variable, those events
needs to be rewritten