udpated notifcation code