replacing notification with message notification in other places