changed the notification system