Updated notification scenerios