rewritten for new notification service spec