Modify Events.js more