Updated diagnostic