Edited AddEvent