added more notification code