Changed the notification system