Updated notification code to match spec.