update notification to be cleaner with subscriptions to event