add local handling for notify