Notification code update

Sorry for the delay, I had to dig them out of my VM and it took me some time.