Some modifications on notificationController.