More work on the notifier