updated to fix notification code