Added changes for notification code to work