Added conditional show notification