Drastically simplified the notification system code