Notifier rewrite