change in event design
Event Queue partially done