diff --git a/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/latest-hiv-ncd-triage.json b/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/latest-hiv-ncd-triage.json
new file mode 100644
index 000000000..6ebd5656c
--- /dev/null
+++ b/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/disaggregations/latest-hiv-ncd-triage.json
@@ -0,0 +1,46 @@
+{
+    "name": "ncdLatestClinicalEncounterDate",
+    "version": "1.0",
+    "tag": "",
+    "description": "",
+    "uses": [],
+    "sources": [
+      {
+        "table": "etl.flat_ncd",
+        "alias": "t1"
+      }
+    ],
+    "columns": [
+      {
+        "type": "simple_column",
+        "alias": "person_id",
+        "column": "t1.person_id"
+      },
+      {
+        "type": "simple_column",
+        "alias": "latest_encounter_date",
+        "column": "MAX(t1.encounter_datetime)"
+      },
+      {
+        "type": "simple_column",
+        "alias": "location_id",
+        "column": "t1.location_id"
+      }
+    ],
+    "filters": {
+      "conditionJoinOperator": "and",
+      "conditions": [
+        {
+          "filterType": "tableColumns",
+          "conditionExpression": "t1.is_clinical_encounter = 1",
+          "parameterName": ""
+        }
+      ]
+    },
+    "groupBy": {
+      "groupParam": "groupByParam",
+      "columns": ["t1.person_id"],
+      "excludeParam": "excludeParam"
+    }
+  }
+  
\ No newline at end of file
diff --git a/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report-indicators.json b/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report-indicators.json
index 15bb2e2ea..84d1181f5 100644
--- a/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report-indicators.json
+++ b/app/reporting-framework/json-reports/plhiv-ncd-v2-reports/plhiv-ncd-v2-report-indicators.json
@@ -511,29 +511,36 @@
       },
       {
         "label": "Mentally Ill",
+        "required": "0",
         "indicator": [
           {
             "type": "nw_mh_f",
+            "required": "1",
             "description": "Female new in care and have mental health disorder"
           },
           {
             "type": "nw_mh_m",
+            "required": "1",
             "description": "Male new in care and have mental health disorder"
           },
           {
             "type": "nw_mh",
+            "required": "1",
             "description": "PLHIV new in care and have mental health disorder"
           },
           {
             "type": "ct_mh_f",
+            "required": "1",
             "description": "Female continuing in care and have mental health disorder"
           },
           {
             "type": "ct_mh_m",
+            "required": "1",
             "description": "Male continuing in care and have mental health disorder"
           },
           {
             "type": "ct_mh",
+            "required": "1",
             "description": "PLHIV continuing in care and have mental health disorder"
           }
         ]
@@ -560,6 +567,130 @@
       }
     ]
   },
+  {
+    "sectionTitle": "Other Cardiovascular Diseases",
+    "indicators": [
+      {
+        "label": "Location",
+        "indicator": "location"
+      },
+      {
+        "label": "Status",
+        "indicator": ["New", "CT"]
+      },
+      {
+        "label": "Header",
+        "indicator": ["F", "M", "T", "F", "M", "T"]
+      },
+      {
+        "label": "Heart Failure",
+        "indicator": [
+          {
+            "type": "nw_hf_f",
+            "description": "Female new in care and have heart failure"
+          },
+          {
+            "type": "nw_hf_m",
+            "description": "Male new in care and have heart failure"
+          },
+          {
+            "type": "tot_nw_hf",
+            "description": "PLHIV new in care and have heart failure"
+          },
+          {
+            "type": "ct_hf_f",
+            "description": "Female continuing in care and have heart failure"
+          },
+          {
+            "type": "ct_hf_m",
+            "description": "Male continuing in care and have heart failure"
+          },
+          {
+            "type": "tot_ct_hf",
+            "description": "PLHIV continuing in care and have heart failure"
+          }
+        ]
+      },
+      {
+        "label": "Myocardinal Infarction",
+        "indicator": [
+          {
+            "type": "nw_myo_inf_f",
+            "description": "Female new in care and have Myocardinal Infarction"
+          },
+          {
+            "type": "nw_myo_inf_m",
+            "description": "Male new in care and have Myocardinal Infarction"
+          },
+          {
+            "type": "tot_nw_myo_inf",
+            "description": "PLHIV new in care and have Myocardinal Infarction"
+          },
+          {
+            "type": "ct_myo_inf_f",
+            "description": "Female continuing in care and have Myocardinal Infarction"
+          },
+          {
+            "type": "ct_myo_inf_m",
+            "description": "Male continuing in care and have Myocardinal Infarction"
+          },
+          {
+            "type": "tot_ct_myo_inft",
+            "description": "PLHIV continuing in care and have Myocardinal Infarction"
+          }
+        ]
+      },
+      {
+        "label": "General Cardiovascular Disorder ",
+        "indicator": [
+          {
+            "type": "sub_tot_nw_cvd_f",
+            "description": "Female new in care and have Cardiovascular Disease"
+          },
+          {
+            "type": "sub_tot_nw_cvd_m",
+            "description": "Male new in care and have Cardiovascular Disease"
+          },
+          {
+            "type": "sub_tot_nw_cvd",
+            "description": "PLHIV new in care and have Cardiovascular Disease"
+          },
+          {
+            "type": "sub_tot_ct_cvd_f",
+            "description": "Female continuing in care and have Cardiovascular Disease"
+          },
+          {
+            "type": "sub_tot_ct_cvd_m",
+            "description": "Male continuing in care and have Cardiovascular Disease"
+          },
+          {
+            "type": "sub_tot_ct_cvd",
+            "description": "PLHIV continuing in care and have Cardiovascular Disease"
+          }
+        ]
+      },
+      {
+        "label": "Status Sub Total",
+        "indicator": [
+          {
+            "type": "tot_nw_cvd",
+            "description": "PLHIV new in care and have Cardiovascular Disease"
+          },
+          {
+            "type": "tot_ct_cvd",
+            "description": "PLHIV continuing in care and have Cardiovascular Disease"
+          }
+        ]
+      },
+      {
+        "label": "Total Cardiovascular Disease",
+        "indicator": {
+          "type": "tot_cvd",
+          "description": "PLHIV having Cardiovascular Disease"
+        }
+      }
+    ]
+  },
   {
     "sectionTitle": "Kidney Disease",
     "indicators": [
@@ -1101,130 +1232,6 @@
       }
     ]
   },
-  {
-    "sectionTitle": "Cardiovascular Disease (other than Hypertension)",
-    "indicators": [
-      {
-        "label": "Location",
-        "indicator": "location"
-      },
-      {
-        "label": "Status",
-        "indicator": ["New", "CT"]
-      },
-      {
-        "label": "Header",
-        "indicator": ["F", "M", "T", "F", "M", "T"]
-      },
-      {
-        "label": "Heart Failure",
-        "indicator": [
-          {
-            "type": "nw_hf_f",
-            "description": "Female new in care and have heart failure"
-          },
-          {
-            "type": "nw_hf_m",
-            "description": "Male new in care and have heart failure"
-          },
-          {
-            "type": "tot_nw_hf",
-            "description": "PLHIV new in care and have heart failure"
-          },
-          {
-            "type": "ct_hf_f",
-            "description": "Female continuing in care and have heart failure"
-          },
-          {
-            "type": "ct_hf_m",
-            "description": "Male continuing in care and have heart failure"
-          },
-          {
-            "type": "tot_ct_hf",
-            "description": "PLHIV continuing in care and have heart failure"
-          }
-        ]
-      },
-      {
-        "label": "Myocardinal Infarction",
-        "indicator": [
-          {
-            "type": "nw_myo_inf_f",
-            "description": "Female new in care and have Myocardinal Infarction"
-          },
-          {
-            "type": "nw_myo_inf_m",
-            "description": "Male new in care and have Myocardinal Infarction"
-          },
-          {
-            "type": "tot_nw_myo_inf",
-            "description": "PLHIV new in care and have Myocardinal Infarction"
-          },
-          {
-            "type": "ct_myo_inf_f",
-            "description": "Female continuing in care and have Myocardinal Infarction"
-          },
-          {
-            "type": "ct_myo_inf_m",
-            "description": "Male continuing in care and have Myocardinal Infarction"
-          },
-          {
-            "type": "tot_ct_myo_inft",
-            "description": "PLHIV continuing in care and have Myocardinal Infarction"
-          }
-        ]
-      },
-      {
-        "label": "General Cardiovascular Disorder ",
-        "indicator": [
-          {
-            "type": "sub_tot_nw_cvd_f",
-            "description": "Female new in care and have Cardiovascular Disease"
-          },
-          {
-            "type": "sub_tot_nw_cvd_m",
-            "description": "Male new in care and have Cardiovascular Disease"
-          },
-          {
-            "type": "sub_tot_nw_cvd",
-            "description": "PLHIV new in care and have Cardiovascular Disease"
-          },
-          {
-            "type": "sub_tot_ct_cvd_f",
-            "description": "Female continuing in care and have Cardiovascular Disease"
-          },
-          {
-            "type": "sub_tot_ct_cvd_m",
-            "description": "Male continuing in care and have Cardiovascular Disease"
-          },
-          {
-            "type": "sub_tot_ct_cvd",
-            "description": "PLHIV continuing in care and have Cardiovascular Disease"
-          }
-        ]
-      },
-      {
-        "label": "Status Sub Total",
-        "indicator": [
-          {
-            "type": "tot_nw_cvd",
-            "description": "PLHIV new in care and have Cardiovascular Disease"
-          },
-          {
-            "type": "tot_ct_cvd",
-            "description": "PLHIV continuing in care and have Cardiovascular Disease"
-          }
-        ]
-      },
-      {
-        "label": "Total Cardiovascular Disease",
-        "indicator": {
-          "type": "tot_cvd",
-          "description": "PLHIV having Cardiovascular Disease"
-        }
-      }
-    ]
-  },
   {
     "sectionTitle": "Neurologic Disease",
     "indicators": [