Changes for notification to minimally work.