EventOnChange is now working