- Changed Event to take type & time as parameters