Updated notification code