Some updates to notification