Using the new notifier everywhere