More work on NotificationManager