some changes to notification