Revised event raising