final changes to the notification system