Final NotificationController.php update