[Comments]: Applying new changes in Jaws_Gadget_Event