diff --git a/src/app/shared/constants/keyPerformanceIndicatorOptions.ts b/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
index 78d0a4f5..97f52a7f 100644
--- a/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
+++ b/src/app/shared/constants/keyPerformanceIndicatorOptions.ts
@@ -18,9 +18,11 @@ export type KeyPerformanceIndicatorValue =
     'reduceExpenseCost' |
     'improveSpaceUtilization' |
     'employeeEngagementWorkforceDevelopment' |
-    'employeeEngagementWorkingEnvironment' | 
+    'employeeEngagementWorkingEnvironment' |
     'maintenanceExpense' |
-    'other';
+    'other' |
+    'airPollutantEmissions' |
+    'waterPollutantEmissions';
 
 export interface KeyPerformanceIndicatorOption {
     primaryKPI: PrimaryKPI,
@@ -110,10 +112,22 @@ export const KeyPerformanceIndicatorOptions: Array<KeyPerformanceIndicatorOption
     },
     {
         primaryKPI: 'Sustainability (Environmental Impact)',
-        label: 'CO, CO2, NOx, SOx emissions',
-        htmlLabel: 'CO, CO<sub>2</sub>, NO<sub>x</sub>, SO<sub>x</sub> emissions',
+        label: 'GHG Emissions',
+        htmlLabel: 'GHG Emissions',
         optionValue: 'chemicalEmissions'
     },
+    {
+        primaryKPI: 'Sustainability (Environmental Impact)',
+        label: 'Air Pollutant Emissions',
+        htmlLabel: 'Air Pollutant Emissions',
+        optionValue: 'airPollutantEmissions'
+    },
+    {
+        primaryKPI: 'Sustainability (Environmental Impact)',
+        label: 'Water Pollutant Emissions',
+        htmlLabel: 'Water Pollutant Emissions',
+        optionValue: 'waterPollutantEmissions'
+    },
     {
         primaryKPI: 'Sustainability (Environmental Impact)',
         label: 'Reduce Refrigerant Gas Emissions',
diff --git a/src/app/shared/constants/keyPerformanceMetrics.ts b/src/app/shared/constants/keyPerformanceMetrics.ts
index 9e902a59..d6bac027 100644
--- a/src/app/shared/constants/keyPerformanceMetrics.ts
+++ b/src/app/shared/constants/keyPerformanceMetrics.ts
@@ -83,7 +83,6 @@ export type KeyPerformanceMetricValue =
     'percentTotalOrCost' |
     'consumptionCostWater' |
     'consumptionCostSewage' |
-    'percentOrTotalChemicalEmissions' |
     'percentOrTotalRefrigerantEmissions' |
     'TRIR' |
     'oshaRecordableIncidents' |
@@ -104,7 +103,15 @@ export type KeyPerformanceMetricValue =
     'treatmentChemicals' |
     'rawMaterials' |
     'intermediateGoods' |
-    'custom';
+    'custom' |
+    'scope1Emissions' |
+    'scope2Emissions' |
+    'scope3Emissions' |
+    'percentTestsMeetingStandardsAirPollutants' |
+    'noxSoxCoEmissions' |
+    'particulateEmissions' |
+    'percentTestsMeetingStandardsWaterPollutants' |
+    'sewageCosts';
 
 
 export type KpmCalculationMethod = 'costPerUnit' | 'percentTotal' | 'directCost';
@@ -534,10 +541,73 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         calculationMethod: 'percentTotal'
     },
     {
-        label: "Quantity",
-        htmlLabel: "Quantity",
-        value: "percentOrTotalChemicalEmissions",
+        label: "Scope 1 Emissions",
+        htmlLabel: "Scope 1 Emissions",
+        value: "scope1Emissions",
+        kpiValue: "chemicalEmissions",
+        isQuantitative: true,
+        goalToIncrease: false,
+        totalUnit: 'tonne CO2e',
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
+    },
+    {
+        label: "Scope 2 Emissions",
+        htmlLabel: "Scope 2 Emissions",
+        value: "scope2Emissions",
+        kpiValue: "chemicalEmissions",
+        totalUnit: 'tonne CO2e',
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
+    },
+    {
+        label: "Scope 3 Emissions",
+        htmlLabel: "Scope 3 Emissions",
+        value: "scope3Emissions",
         kpiValue: "chemicalEmissions",
+        totalUnit: 'tonne CO2e',
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'costPerUnit'
+    },
+    {
+        label: "Particulate Emissions",
+        htmlLabel: "Particulate Emissions",
+        value: "particulateEmissions",
+        kpiValue: "airPollutantEmissions",
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
+    },
+    {
+        label: "NOx, SOx, CO Emissions",
+        htmlLabel: "NOx, SOx, CO Emissions",
+        value: "noxSoxCoEmissions",
+        kpiValue: "airPollutantEmissions",
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
+    },
+    {
+        label: "Percent of tests that meet regulatory standards",
+        htmlLabel: "Percent of tests that meet regulatory standards",
+        value: "percentTestsMeetingStandardsAirPollutants",
+        kpiValue: "airPollutantEmissions",
+        isQuantitative: true,
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'percentTotal'
+    },
+    {
+        label: "Percent of tests that meet regulatory standards",
+        htmlLabel: "Percent of tests that meet regulatory standards",
+        value: "percentTestsMeetingStandardsWaterPollutants",
+        kpiValue: "waterPollutantEmissions",
         isQuantitative: true,
         goalToIncrease: false,
         timePeriod: 'yr',
@@ -753,5 +823,16 @@ export const KeyPerformanceMetricOptions: Array<KeyPerformanceMetricOption> = [
         goalToIncrease: false,
         timePeriod: 'yr',
         calculationMethod: 'directCost'
+    },,
+    {
+        label: "Sewage Costs",
+        htmlLabel: "Sewage Costs",
+        value: "sewageCosts",
+        kpiValue: "waterConsumption",
+        isQuantitative: true,
+        totalUnit: '',
+        goalToIncrease: false,
+        timePeriod: 'yr',
+        calculationMethod: 'directCost'
     },
 ]
\ No newline at end of file
diff --git a/src/app/shared/constants/nonEnergyBenefitOptions.ts b/src/app/shared/constants/nonEnergyBenefitOptions.ts
index 0e4f65f1..81dbcbdc 100644
--- a/src/app/shared/constants/nonEnergyBenefitOptions.ts
+++ b/src/app/shared/constants/nonEnergyBenefitOptions.ts
@@ -59,11 +59,13 @@ export type NebOptionValue = 'improvedImageOrReputation' |
     'reduceUnscheduledBreaks' |
     'reduceWorkplaceIncidentsRelatedToHeat' |
     'increaseWorkplaceSecurity' |
-    'increaseEnergyResiliency' | 
-    'reduceNeedOshaHearingProgram' | 
-    'reduceUnsafeOperatorActs' | 
-    'reduceLikelinessOfOccupationalDangers' | 
-    'reduceCostsForLabor';
+    'increaseEnergyResiliency' |
+    'reduceNeedOshaHearingProgram' |
+    'reduceUnsafeOperatorActs' |
+    'reduceLikelinessOfOccupationalDangers' |
+    'reduceCostsForLabor' |
+    'reduceRegulatoryCosts' |
+    'improvedWaterQuality';
 
 
 export const NebOptions: Array<NebOption> = [
@@ -325,7 +327,7 @@ export const NebOptions: Array<NebOption> = [
         optionValue: "reduceWaterConsumption",
         isQualitative: true,
         howToCalculate: "N/A",
-        KPM: ["contributeCompanyVision", "consumptionCostWater"],
+        KPM: ["contributeCompanyVision", "consumptionCostWater", "sewageCosts"],
         selectedKPM: []
     },
     {
@@ -334,7 +336,7 @@ export const NebOptions: Array<NebOption> = [
         optionValue: "reduceSewageVolume",
         isQualitative: true,
         howToCalculate: "N/A",
-        KPM: ["contributeCompanyVision", "consumptionCostSewage"],
+        KPM: ["contributeCompanyVision", "consumptionCostSewage", "sewageCosts"],
         selectedKPM: []
     },
     {
@@ -343,20 +345,9 @@ export const NebOptions: Array<NebOption> = [
         optionValue: "reduceDustEmissions",
         isQualitative: true,
         howToCalculate: "N/A",
-        KPM: ["contributeCompanyVision", "totalLbsDust"],
+        KPM: ["contributeCompanyVision", "totalLbsDust", "particulateEmissions"],
         selectedKPM: []
     },
-    // {
-    //     label: "Reduce CO, CO2, NOx, SOx emissions",
-    //     htmlLabel: "Reduce CO, CO<sub>2</sub>, NO<sub>x</sub>, SO<sub>x</sub> emissions",
-    //     optionValue: "reduceChemicalEmissions",
-    //     // riskReduction: true,
-    //     // valuePropositionIncrease: true,
-    //     // decreaseCosts: true,
-    //     isQualitative: true,
-    //     howToCalculate: "N/A",
-    //     KPM: ["contributeCompanyVision", "percentOrTotalChemicalEmissions"],
-    // },
     {
         label: "Reduce refrigerant gas emissions",
         htmlLabel: "Reduce refrigerant gas emissions",
@@ -417,7 +408,7 @@ export const NebOptions: Array<NebOption> = [
         optionValue: "improveAmbientAirQuality",
         isQualitative: true,
         howToCalculate: "N/A",
-        KPM: ["defectiveProductionDollar", "defectRatePPMorDPM", "totalLbsDust", "numberOfParticles"],
+        KPM: ["defectiveProductionDollar", "defectRatePPMorDPM", "totalLbsDust", "numberOfParticles", "particulateEmissions", "noxSoxCoEmissions", "percentTestsMeetingStandardsAirPollutants"],
         selectedKPM: []
     },
     {
@@ -536,5 +527,32 @@ export const NebOptions: Array<NebOption> = [
         howToCalculate: "N/A",
         KPM: ["contributeCompanyVision", "productivityRateThroughput", "productionCosts", "cycleTimeToMakeGoods", "percentOnTimeToDueDate", "revenuePerEmployee", "perUnitProductCost", "equipmentDowntime", "percentCapacityUtilization", "overallEquipmentEffectiveness", "forkTruckBreakdownTime", "defectiveProductionDollar", "defectRatePPMorDPM", "qualityCustomerComplaints", "qualityCustomerReturns", "percentProductionYield", "percentShrinkage", "dollarConsumables", "TRIR", "oshaNonRecordables", "oshaRecordableIncidents", "absenteeism", "employeeEngagementSatisfaction", "employeeRetentionRate", "talentTurnoverRate"],
         selectedKPM: []
+    },
+    {
+        label: "Reduce GHG emissions",
+        htmlLabel: "Reduce GHG emissions",
+        optionValue: "reduceChemicalEmissions",
+        isQualitative: true,
+        howToCalculate: "N/A",
+        KPM: ["scope1Emissions", "scope2Emissions", "scope3Emissions"],
+        selectedKPM: []
+    },
+    {
+        label: "Reduce regulatory costs",
+        htmlLabel: "Reduce regulatory costs",
+        optionValue: "reduceRegulatoryCosts",
+        isQualitative: true,
+        howToCalculate: "N/A",
+        KPM: ["scope1Emissions", "scope2Emissions", "scope3Emissions", "particulateEmissions", "noxSoxCoEmissions", "percentTestsMeetingStandardsAirPollutants", "percentTestsMeetingStandardsWaterPollutants"],
+        selectedKPM: []
+    },
+    {
+        label: "Improved water quality",
+        htmlLabel: "Improved water quality",
+        optionValue: "improvedWaterQuality",
+        isQualitative: true,
+        howToCalculate: "N/A",
+        KPM: ["percentTestsMeetingStandardsWaterPollutants"],
+        selectedKPM: []
     }
 ]