Including extra check in the notification