Improved : Notification function