modified CommonEvent.js