[Comments]: Applying new changes in Jaws_Event