made some changes in event spec