Vastly simplified the notifiers code