AddEvent amended