Updated diagnostic forms