Changed how notifier is checked.