code changes for notifications