Upgraded notifier