Small amount of work on event notifications