Added custom events, so no need for JQuery events