diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8734c6d..bec4c77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 
 **Changes in version 5.11 (not released yet)**
 
+- Updated data for the EPH SubCountry algorithms and switched to the 2020 geographies; the three 2010 output variables were retired and replaced by 2020 variables. 
+- Updated data for the Persistence Poverty algorithm; added new variable based on 2020 geographies and added output value 2 (not available) in addition to the 0 and 1.
+- Updated data for the Tract-Estimated Congressional Districts algorithm.
+- Retired two Cancer Reporting Zone variables and replaced them on two sets of 2010/2020 variables all based on 2020 geographies.
 - Updated neoadjuvTherapyTreatmentEffect lookups (added missing schemas 09210, 09350 and 09360).
 - Updated the Yost/ACS algorithm to extend the second-to-last range of the "year for lookup" by one year and to implement the A,B,C,D codes that are found in other census tract lookups.  
 - Added 2023 calculated field for Rural Urban Continuum algorithm.
diff --git a/src/main/java/com/imsweb/algorithms/Algorithms.java b/src/main/java/com/imsweb/algorithms/Algorithms.java
index b0a4ebd..b4c825c 100644
--- a/src/main/java/com/imsweb/algorithms/Algorithms.java
+++ b/src/main/java/com/imsweb/algorithms/Algorithms.java
@@ -206,14 +206,17 @@ public final class Algorithms {
     public static final String FIELD_ACS_POV_ASIAN_NHOPI = "acsPctPovAsianNHOPI";
     public static final String FIELD_ACS_POV_WHITE_NON_HISP = "acsPctPovWhiteNonHisp";
     public static final String FIELD_ACS_POV_HISP = "acsPctPovHispanic";
-    public static final String FIELD_EPHT_2010_GEOID_5K = "epht2010GeoId5k";
-    public static final String FIELD_EPHT_2010_GEOID_20K = "epht2010GeoId20k";
-    public static final String FIELD_EPHT_2010_GEOID_50K = "epht2010GeoId50k";
+    public static final String FIELD_EPHT_2020_GEOID_5K = "epht2020GeoId5k";
+    public static final String FIELD_EPHT_2020_GEOID_20K = "epht2020GeoId20k";
+    public static final String FIELD_EPHT_2020_GEOID_50K = "epht2020GeoId50k";
     public static final String FIELD_TRACT_EST_CONGRESS_DIST_118 = "tractEstCongressDist118";
     public static final String FIELD_TRACT_EST_CONGRESS_DIST_119 = "tractEstCongressDist119";
-    public static final String FIELD_CANCER_REPORTING_ZONE = "cancerReportingZone";
-    public static final String FIELD_CANCER_REPORTING_ZONE_TRACT_REQ = "cancerReportingZoneTractReq";
-    public static final String FIELD_PERSISTENT_POVERTY = "persistentPoverty";
+    public static final String FIELD_CANCER_RPT_ZONE_2010 = "cancerRptZone2010";
+    public static final String FIELD_CANCER_RPT_ZONE_TRACT_REQ_2010 = "cancerRptZoneTractReq2010";
+    public static final String FIELD_CANCER_RPT_ZONE_2020 = "cancerRptZone2020";
+    public static final String FIELD_CANCER_RPT_ZONE_TRACT_REQ_2020 = "cancerRptZoneTractReq2020";
+    public static final String FIELD_PERSISTENT_POVERTY_0711 = "perPov0711";
+    public static final String FIELD_PERSISTENT_POVERTY_1721 = "perPov1721";
     public static final String FIELD_SEER_BRAIN_CSN_RECODE_2020 = "seerBrainCnsRecode2020";
     public static final String FIELD_SEER_LYMPH_NEO_RECODE_2021 = "seerLymphNeoplasmRecode2021";
     public static final String FIELD_DERIVED_SUMMARY_GRADE_2018 = "derivedSummaryGrade2018";
@@ -368,14 +371,17 @@ public static void initialize() {
             addField(AlgorithmField.of(FIELD_ACS_POV_ASIAN_NHOPI, 9616, 6, "ACS Pct Poverty (2Asian/NHOPI)", "ACS Pov Asian/NHOPI", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_ACS_POV_WHITE_NON_HISP, 9618, 6, "ACS Pct Poverty (White, Non-Hispanic)", "ACS Pov Non-Hispanic", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_ACS_POV_HISP, 9619, 6, "ACS Pct Poverty (Hispanic)", "ACS Pov Hispanic", DATA_LEVEL_TUMOR, false));
-            addField(AlgorithmField.of(FIELD_EPHT_2010_GEOID_5K, 9993, 11, "EPHT 2010 GEO ID 5K", "EPHT 5K", DATA_LEVEL_TUMOR, false));
-            addField(AlgorithmField.of(FIELD_EPHT_2010_GEOID_20K, 9994, 11, "EPHT 2010 GEO ID 20K", "EPHT 20K", DATA_LEVEL_TUMOR, false));
-            addField(AlgorithmField.of(FIELD_EPHT_2010_GEOID_50K, 9995, 11, "EPHT 2010 GEO ID 50K", "EPHT 50K", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_EPHT_2020_GEOID_5K, 9996, 11, "EPHT 2010 GEO ID 5K", "EPHT 5K", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_EPHT_2020_GEOID_20K, 9997, 11, "EPHT 2010 GEO ID 20K", "EPHT 20K", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_EPHT_2020_GEOID_50K, 9998, 11, "EPHT 2010 GEO ID 50K", "EPHT 50K", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_TRACT_EST_CONGRESS_DIST_118, 9405, 4, "Tract-Estimated 118th Congressional District", "Tract-Est 118", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_TRACT_EST_CONGRESS_DIST_119, 9406, 4, "Tract-Estimated 119th Congressional District", "Tract-Est 119", DATA_LEVEL_TUMOR, false));
-            addField(AlgorithmField.of(FIELD_CANCER_REPORTING_ZONE, 9415, 10, "Cancer Reporting Zone", "Cancer Rpt Zone", DATA_LEVEL_TUMOR, false));
-            addField(AlgorithmField.of(FIELD_CANCER_REPORTING_ZONE_TRACT_REQ, 9416, 1, "Census Tract Required for Cancer Reporting Zone", "Cancer Rpt Zone Tract Cert", DATA_LEVEL_TUMOR, false));
-            addField(AlgorithmField.of(FIELD_PERSISTENT_POVERTY, 9625, 1, "Persistence Poverty", "Persist Pov", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_CANCER_RPT_ZONE_2010, 9435, 10, "Cancer Reporting Zone (2010 Defined)", "Cancer Rpt Zone 10", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2010, 9436, 1, "Census Tract Req for Cancer Rpt Zone (2010 Def)", "Cancer Rpt Zone Tract Req 10", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_CANCER_RPT_ZONE_2020, 9437, 10, "Cancer Reporting Zone (2020 Defined)", "Cancer Rpt Zone 20", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2020, 9438, 1, "Census Tract Req for Cancer Rpt Zone (2020 Def)", "Cancer Rpt Zone Tract Req 20", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_PERSISTENT_POVERTY_0711, 9626, 1, "Persistent Poverty 2007-2011", "Persist Pov 07-11", DATA_LEVEL_TUMOR, false));
+            addField(AlgorithmField.of(FIELD_PERSISTENT_POVERTY_1721, 9627, 1, "Persistent Poverty 2017-2021", "Persist Pov 17-21", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_SEER_BRAIN_CSN_RECODE_2020, 9455, 2, "SEER Brain/CNS Recode 2020", "Brain/CNS", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_SEER_LYMPH_NEO_RECODE_2021, 9450, 2, "SEER Lymphoid Neoplasm Recode 2021", "Lymph 21", DATA_LEVEL_TUMOR, false));
             addField(AlgorithmField.of(FIELD_CDC_SVI_2018, 9600, 5, "CDC/ATSDR Social Vulnerability Index 2018", "CDC/ATSDR SVI 18", DATA_LEVEL_TUMOR, false));
diff --git a/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneAlgorithm.java b/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneAlgorithm.java
index f096ad7..e2d74c9 100644
--- a/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneAlgorithm.java
+++ b/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneAlgorithm.java
@@ -14,8 +14,10 @@
 import com.imsweb.algorithms.StateCountyTractInputDto;
 import com.imsweb.algorithms.internal.Utils;
 
-import static com.imsweb.algorithms.Algorithms.FIELD_CANCER_REPORTING_ZONE;
-import static com.imsweb.algorithms.Algorithms.FIELD_CANCER_REPORTING_ZONE_TRACT_REQ;
+import static com.imsweb.algorithms.Algorithms.FIELD_CANCER_RPT_ZONE_2010;
+import static com.imsweb.algorithms.Algorithms.FIELD_CANCER_RPT_ZONE_2020;
+import static com.imsweb.algorithms.Algorithms.FIELD_CANCER_RPT_ZONE_TRACT_REQ_2010;
+import static com.imsweb.algorithms.Algorithms.FIELD_CANCER_RPT_ZONE_TRACT_REQ_2020;
 import static com.imsweb.algorithms.Algorithms.FIELD_CENSUS_2010;
 import static com.imsweb.algorithms.Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS;
 import static com.imsweb.algorithms.Algorithms.FIELD_STATE_DX;
@@ -31,11 +33,15 @@ public CancerReportingZoneAlgorithm() {
         _inputFields.add(Algorithms.getField(FIELD_COUNTY_AT_DX_ANALYSIS));
         _inputFields.add(Algorithms.getField(FIELD_CENSUS_2010));
 
-        _outputFields.add(Algorithms.getField(FIELD_CANCER_REPORTING_ZONE));
-        _outputFields.add(Algorithms.getField(FIELD_CANCER_REPORTING_ZONE_TRACT_REQ));
+        _outputFields.add(Algorithms.getField(FIELD_CANCER_RPT_ZONE_2010));
+        _outputFields.add(Algorithms.getField(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2010));
+        _outputFields.add(Algorithms.getField(FIELD_CANCER_RPT_ZONE_2020));
+        _outputFields.add(Algorithms.getField(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2020));
 
-        _unknownValues.put(FIELD_CANCER_REPORTING_ZONE, Arrays.asList(CANCER_REPORTING_ZONE_UNK_A, CANCER_REPORTING_ZONE_UNK_D));
-        _unknownValues.put(FIELD_CANCER_REPORTING_ZONE_TRACT_REQ, Arrays.asList(CANCER_REPORTING_ZONE_UNK_A, CANCER_REPORTING_ZONE_UNK_D));
+        _unknownValues.put(FIELD_CANCER_RPT_ZONE_2010, Arrays.asList(CANCER_REPORTING_ZONE_UNK_A, CANCER_REPORTING_ZONE_UNK_D));
+        _unknownValues.put(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2010, Arrays.asList(CANCER_REPORTING_ZONE_UNK_A, CANCER_REPORTING_ZONE_UNK_D));
+        _unknownValues.put(FIELD_CANCER_RPT_ZONE_2020, Arrays.asList(CANCER_REPORTING_ZONE_UNK_A, CANCER_REPORTING_ZONE_UNK_D));
+        _unknownValues.put(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2020, Arrays.asList(CANCER_REPORTING_ZONE_UNK_A, CANCER_REPORTING_ZONE_UNK_D));
     }
 
     @Override
@@ -48,8 +54,10 @@ public AlgorithmOutput execute(AlgorithmInput input) {
             CancerReportingZoneOutputDto outputDto = CancerReportingZoneUtils.computeCancerReportingZone(inputDto);
 
             Map<String, Object> outputTumor = new HashMap<>();
-            outputTumor.put(FIELD_CANCER_REPORTING_ZONE, outputDto.getCancerReportingZone());
-            outputTumor.put(FIELD_CANCER_REPORTING_ZONE_TRACT_REQ, outputDto.getCancerReportingZoneTractReq());
+            outputTumor.put(FIELD_CANCER_RPT_ZONE_2010, outputDto.getCancerReportingZone2010());
+            outputTumor.put(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2010, outputDto.getCancerReportingZoneTractReq2020());
+            outputTumor.put(FIELD_CANCER_RPT_ZONE_2020, outputDto.getCancerReportingZone2010());
+            outputTumor.put(FIELD_CANCER_RPT_ZONE_TRACT_REQ_2020, outputDto.getCancerReportingZoneTractReq2020());
 
             Utils.addTumorOutput(outputPatient, outputTumor);
         }
diff --git a/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneOutputDto.java b/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneOutputDto.java
index 6db8437..4f003a3 100644
--- a/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneOutputDto.java
+++ b/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneOutputDto.java
@@ -5,23 +5,43 @@
 
 public class CancerReportingZoneOutputDto {
 
-    private String _cancerReportingZone;
+    private String _cancerReportingZone2010;
 
-    private String _cancerReportingZoneTractReq;
+    private String _cancerReportingZoneTractReq2010;
 
-    public String getCancerReportingZone() {
-        return _cancerReportingZone;
+    private String _cancerReportingZone2020;
+
+    private String _cancerReportingZoneTractReq2020;
+
+    public String getCancerReportingZone2010() {
+        return _cancerReportingZone2010;
+    }
+
+    public void setCancerReportingZone2010(String cancerReportingZone2010) {
+        _cancerReportingZone2010 = cancerReportingZone2010;
+    }
+
+    public String getCancerReportingZoneTractReq2010() {
+        return _cancerReportingZoneTractReq2010;
+    }
+
+    public void setCancerReportingZoneTractReq2010(String cancerReportingZoneTractReq2010) {
+        _cancerReportingZoneTractReq2010 = cancerReportingZoneTractReq2010;
+    }
+
+    public String getCancerReportingZone2020() {
+        return _cancerReportingZone2020;
     }
 
-    public void setCancerReportingZone(String cancerReportingZone) {
-        _cancerReportingZone = cancerReportingZone;
+    public void setCancerReportingZone2020(String cancerReportingZone2020) {
+        _cancerReportingZone2020 = cancerReportingZone2020;
     }
 
-    public String getCancerReportingZoneTractReq() {
-        return _cancerReportingZoneTractReq;
+    public String getCancerReportingZoneTractReq2020() {
+        return _cancerReportingZoneTractReq2020;
     }
 
-    public void setCancerReportingZoneTractReq(String cancerReportingZoneTractReq) {
-        _cancerReportingZoneTractReq = cancerReportingZoneTractReq;
+    public void setCancerReportingZoneTractReq2020(String cancerReportingZoneTractReq2020) {
+        _cancerReportingZoneTractReq2020 = cancerReportingZoneTractReq2020;
     }
 }
diff --git a/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtils.java b/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtils.java
index 6eae2d3..38f9cca 100644
--- a/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtils.java
+++ b/src/main/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtils.java
@@ -11,7 +11,7 @@
 public final class CancerReportingZoneUtils {
 
     public static final String ALG_NAME = "NAACCR Cancer Reporting Zones";
-    public static final String ALG_VERSION = "version 1.0 released in August 2021";
+    public static final String ALG_VERSION = "August 21, 2026";
 
     //Unknown values for each code
     public static final String CANCER_REPORTING_ZONE_UNK_A = "A";
@@ -30,11 +30,11 @@ private CancerReportingZoneUtils() {
      * <ul>
      * <li>addressAtDxState (#80)</li>
      * <li>countyAtDxAnalysis (#89)</li>
-     * <li>censusTract2010 (#135)</li>
+     * <li>censusTract2020 (#135)</li>
      * </ul>
      * All those properties are defined as constants in this class.
      * <br/><br/>
-     * The returned Cancer Reporting Zone will be a 5-digit or 7-digit alphanumeric code or it can be one of the unknown values listed below :
+     * The returned Cancer Reporting Zone will be a 5-digit or 7-digit alphanumeric code, or it can be one of the unknown values listed below :
      * <ul>
      * <li>A = State, county, or tract are invalid</li>
      * <li>B = State and tract are valid, but county was not reported</li>
@@ -50,30 +50,52 @@ public static CancerReportingZoneOutputDto computeCancerReportingZone(StateCount
 
         input.applyRecodes();
 
-        if (input.hasInvalidStateCountyOrCensusTract(CensusTract.CENSUS_2010)) {
-            result.setCancerReportingZone(CANCER_REPORTING_ZONE_UNK_A);
-            result.setCancerReportingZoneTractReq(CANCER_REPORTING_ZONE_UNK_A);
+        if (input.hasInvalidStateCountyOrCensusTract(CensusTract.CENSUS_2020)) {
+            // 2010
+            result.setCancerReportingZone2010(CANCER_REPORTING_ZONE_UNK_A);
+            result.setCancerReportingZoneTractReq2010(CANCER_REPORTING_ZONE_UNK_A);
+            // 2020
+            result.setCancerReportingZone2020(CANCER_REPORTING_ZONE_UNK_A);
+            result.setCancerReportingZoneTractReq2020(CANCER_REPORTING_ZONE_UNK_A);
         }
-        else if (input.hasUnknownStateCountyOrCensusTract(CensusTract.CENSUS_2010)) {
-            result.setCancerReportingZone(CANCER_REPORTING_ZONE_UNK_D);
-            result.setCancerReportingZoneTractReq(CANCER_REPORTING_ZONE_UNK_D);
+        else if (input.hasUnknownStateCountyOrCensusTract(CensusTract.CENSUS_2020)) {
+            // 2010
+            result.setCancerReportingZone2010(CANCER_REPORTING_ZONE_UNK_D);
+            result.setCancerReportingZoneTractReq2010(CANCER_REPORTING_ZONE_UNK_D);
+            // 2020
+            result.setCancerReportingZone2020(CANCER_REPORTING_ZONE_UNK_D);
+            result.setCancerReportingZoneTractReq2020(CANCER_REPORTING_ZONE_UNK_D);
         }
         else if (input.countyIsNotReported()) {
-            result.setCancerReportingZone(CANCER_REPORTING_ZONE_UNK_B);
-            result.setCancerReportingZoneTractReq(CANCER_REPORTING_ZONE_UNK_B);
+            // 2010
+            result.setCancerReportingZone2010(CANCER_REPORTING_ZONE_UNK_B);
+            result.setCancerReportingZoneTractReq2010(CANCER_REPORTING_ZONE_UNK_B);
+            // 2020
+            result.setCancerReportingZone2020(CANCER_REPORTING_ZONE_UNK_B);
+            result.setCancerReportingZoneTractReq2020(CANCER_REPORTING_ZONE_UNK_B);
         }
         else {
-            CensusData censusData = CountryData.getCensusData(input, CensusTract.CENSUS_2010);
+            CensusData censusData = CountryData.getCensusData(input, CensusTract.CENSUS_2020);
             if (censusData != null) {
-                result.setCancerReportingZone(censusData.getCancerReportingZone());
-                result.setCancerReportingZoneTractReq(censusData.getCancerReportingZoneTractCert());
+                // 2010
+                result.setCancerReportingZone2010(censusData.getCancerReportingZone2010());
+                result.setCancerReportingZoneTractReq2010(censusData.getCancerReportingZoneTractReq2010());
+                // 2020
+                result.setCancerReportingZone2020(censusData.getCancerReportingZone2020());
+                result.setCancerReportingZoneTractReq2020(censusData.getCancerReportingZoneTractReq2020());
             }
         }
 
-        if (result.getCancerReportingZone() == null)
-            result.setCancerReportingZone(CANCER_REPORTING_ZONE_UNK_C);
-        if (result.getCancerReportingZoneTractReq() == null)
-            result.setCancerReportingZoneTractReq(CANCER_REPORTING_ZONE_UNK_C);
+        // 2010
+        if (result.getCancerReportingZone2010() == null)
+            result.setCancerReportingZone2010(CANCER_REPORTING_ZONE_UNK_C);
+        if (result.getCancerReportingZoneTractReq2010() == null)
+            result.setCancerReportingZoneTractReq2010(CANCER_REPORTING_ZONE_UNK_C);
+        // 2020
+        if (result.getCancerReportingZone2020() == null)
+            result.setCancerReportingZone2020(CANCER_REPORTING_ZONE_UNK_C);
+        if (result.getCancerReportingZoneTractReq2020() == null)
+            result.setCancerReportingZoneTractReq2020(CANCER_REPORTING_ZONE_UNK_C);
 
         return result;
     }
diff --git a/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyAlgorithm.java b/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyAlgorithm.java
index a496d73..6785882 100644
--- a/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyAlgorithm.java
+++ b/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyAlgorithm.java
@@ -17,12 +17,12 @@
 
 import static com.imsweb.algorithms.Algorithms.FIELD_CENSUS_2010;
 import static com.imsweb.algorithms.Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS;
-import static com.imsweb.algorithms.Algorithms.FIELD_EPHT_2010_GEOID_20K;
-import static com.imsweb.algorithms.Algorithms.FIELD_EPHT_2010_GEOID_50K;
-import static com.imsweb.algorithms.Algorithms.FIELD_EPHT_2010_GEOID_5K;
+import static com.imsweb.algorithms.Algorithms.FIELD_EPHT_2020_GEOID_20K;
+import static com.imsweb.algorithms.Algorithms.FIELD_EPHT_2020_GEOID_50K;
+import static com.imsweb.algorithms.Algorithms.FIELD_EPHT_2020_GEOID_5K;
 import static com.imsweb.algorithms.Algorithms.FIELD_STATE_DX;
-import static com.imsweb.algorithms.ephtsubcounty.EphtSubCountyUtils.EPHT_2010_GEO_ID_UNK_A;
-import static com.imsweb.algorithms.ephtsubcounty.EphtSubCountyUtils.EPHT_2010_GEO_ID_UNK_D;
+import static com.imsweb.algorithms.ephtsubcounty.EphtSubCountyUtils.EPHT_2020_GEO_ID_UNK_A;
+import static com.imsweb.algorithms.ephtsubcounty.EphtSubCountyUtils.EPHT_2020_GEO_ID_UNK_D;
 
 public class EphtSubCountyAlgorithm extends AbstractAlgorithm {
 
@@ -33,13 +33,13 @@ public EphtSubCountyAlgorithm() {
         _inputFields.add(Algorithms.getField(FIELD_COUNTY_AT_DX_ANALYSIS));
         _inputFields.add(Algorithms.getField(FIELD_CENSUS_2010));
 
-        _outputFields.add(Algorithms.getField(FIELD_EPHT_2010_GEOID_5K));
-        _outputFields.add(Algorithms.getField(FIELD_EPHT_2010_GEOID_20K));
-        _outputFields.add(Algorithms.getField(FIELD_EPHT_2010_GEOID_50K));
+        _outputFields.add(Algorithms.getField(FIELD_EPHT_2020_GEOID_5K));
+        _outputFields.add(Algorithms.getField(FIELD_EPHT_2020_GEOID_20K));
+        _outputFields.add(Algorithms.getField(FIELD_EPHT_2020_GEOID_50K));
 
-        _unknownValues.put(FIELD_EPHT_2010_GEOID_5K, Arrays.asList(EPHT_2010_GEO_ID_UNK_A, EPHT_2010_GEO_ID_UNK_D));
-        _unknownValues.put(FIELD_EPHT_2010_GEOID_20K, Arrays.asList(EPHT_2010_GEO_ID_UNK_A, EPHT_2010_GEO_ID_UNK_D));
-        _unknownValues.put(FIELD_EPHT_2010_GEOID_50K, Arrays.asList(EPHT_2010_GEO_ID_UNK_A, EPHT_2010_GEO_ID_UNK_D));
+        _unknownValues.put(FIELD_EPHT_2020_GEOID_5K, Arrays.asList(EPHT_2020_GEO_ID_UNK_A, EPHT_2020_GEO_ID_UNK_D));
+        _unknownValues.put(FIELD_EPHT_2020_GEOID_20K, Arrays.asList(EPHT_2020_GEO_ID_UNK_A, EPHT_2020_GEO_ID_UNK_D));
+        _unknownValues.put(FIELD_EPHT_2020_GEOID_50K, Arrays.asList(EPHT_2020_GEO_ID_UNK_A, EPHT_2020_GEO_ID_UNK_D));
     }
 
     @Override
@@ -49,9 +49,9 @@ public AlgorithmOutput execute(AlgorithmInput input) {
             EphtSubCountyOutputDto outputDto = EphtSubCountyUtils.computeEphtSubCounty(createStateCountyTractInputDto(inputTumor));
 
             Map<String, Object> outputTumor = new HashMap<>();
-            outputTumor.put(FIELD_EPHT_2010_GEOID_5K, outputDto.getEpht2010GeoId5k());
-            outputTumor.put(FIELD_EPHT_2010_GEOID_20K, outputDto.getEpht2010GeoId20k());
-            outputTumor.put(FIELD_EPHT_2010_GEOID_50K, outputDto.getEpht2010GeoId50k());
+            outputTumor.put(FIELD_EPHT_2020_GEOID_5K, outputDto.getEpht2020GeoId5k());
+            outputTumor.put(FIELD_EPHT_2020_GEOID_20K, outputDto.getEpht2020GeoId20k());
+            outputTumor.put(FIELD_EPHT_2020_GEOID_50K, outputDto.getEpht2020GeoId50k());
             outputTumors.add(outputTumor);
         }
 
diff --git a/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyOutputDto.java b/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyOutputDto.java
index 97e8260..369c2aa 100644
--- a/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyOutputDto.java
+++ b/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyOutputDto.java
@@ -5,33 +5,33 @@
 
 public class EphtSubCountyOutputDto {
 
-    private String _epht2010GeoId5k;
+    private String _epht2020GeoId5k;
 
-    private String _epht2010GeoId20k;
+    private String _epht2020GeoId20k;
 
-    private String _epht2010GeoId50k;
+    private String _epht2020GeoId50k;
 
-    public String getEpht2010GeoId5k() {
-        return _epht2010GeoId5k;
+    public String getEpht2020GeoId5k() {
+        return _epht2020GeoId5k;
     }
 
-    public void setEpht2010GeoId5k(String epht2010GeoId5k) {
-        _epht2010GeoId5k = epht2010GeoId5k;
+    public void setEpht2020GeoId5k(String epht2020GeoId5k) {
+        _epht2020GeoId5k = epht2020GeoId5k;
     }
 
-    public String getEpht2010GeoId20k() {
-        return _epht2010GeoId20k;
+    public String getEpht2020GeoId20k() {
+        return _epht2020GeoId20k;
     }
 
-    public void setEpht2010GeoId20k(String epht2010GeoId20k) {
-        _epht2010GeoId20k = epht2010GeoId20k;
+    public void setEpht2020GeoId20k(String epht2020GeoId20k) {
+        _epht2020GeoId20k = epht2020GeoId20k;
     }
 
-    public String getEpht2010GeoId50k() {
-        return _epht2010GeoId50k;
+    public String getEpht2020GeoId50k() {
+        return _epht2020GeoId50k;
     }
 
-    public void setEpht2010GeoId50k(String epht2010GeoId50k) {
-        _epht2010GeoId50k = epht2010GeoId50k;
+    public void setEpht2020GeoId50k(String epht2020GeoId50k) {
+        _epht2020GeoId50k = epht2020GeoId50k;
     }
 }
diff --git a/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtils.java b/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtils.java
index 3426e17..b927ec6 100644
--- a/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtils.java
+++ b/src/main/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtils.java
@@ -9,34 +9,34 @@
 import com.imsweb.algorithms.internal.CountryData;
 
 /**
- * This class can be used to calculate EPHT 2010 GEO ID 5K and EPHT 2010 GEO ID 20K.
+ * This class can be used to calculate EPHT 2020 GEO ID 5K/20K/50K.
  */
 public final class EphtSubCountyUtils {
 
     public static final String ALG_NAME = "NPCR EPHT SubCounty";
-    public static final String ALG_VERSION = "version 1.0 released in August 2021";
+    public static final String ALG_VERSION = "August 21, 2026";
 
-    public static final String EPHT_2010_GEO_ID_UNK_A = "A";
-    public static final String EPHT_2010_GEO_ID_UNK_B = "B";
-    public static final String EPHT_2010_GEO_ID_UNK_C = "C";
-    public static final String EPHT_2010_GEO_ID_UNK_D = "D";
+    public static final String EPHT_2020_GEO_ID_UNK_A = "A";
+    public static final String EPHT_2020_GEO_ID_UNK_B = "B";
+    public static final String EPHT_2020_GEO_ID_UNK_C = "C";
+    public static final String EPHT_2020_GEO_ID_UNK_D = "D";
 
     private EphtSubCountyUtils() {
         // no instances of this class allowed!
     }
 
     /**
-     * Calculates the EPHT 2010 GEO ID 5K and EPHT 2010 GEO ID 20K for the provided input DTO
+     * Calculates the EPHT 2020 GEO ID 5K/20K/50K for the provided input DTO
      * <br/><br/>
      * The provided input dto has the following parameters used in the calculation:
      * <ul>
      * <li>addressAtDxState (#80)</li>
      * <li>countyAtDxAnalysis (#89)</li>
-     * <li>censusTract2010 (#135)</li>
+     * <li>censusTract2020 (#135)</li>
      * </ul>
      * All those properties are defined as constants in this class.
      * <br/><br/>
-     * The returned dto will have either an 11-digit value for EPHT 2010 GEO ID 5K, EPHT 2010 GEO ID 20K and EPHT 2010 GEO ID 50K, or one of the possible unknown values:
+     * The returned dto will have either an 11-digit value for EPHT 2020 GEO ID 5K, EPHT 2020 GEO ID 20K and EPHT 2020 GEO ID 50K, or one of the possible unknown values:
      * <ul>
      * <li>A = State, county, or tract are invalid</li>
      * <li>B = State and tract are valid, but county was not reported</li>
@@ -52,36 +52,36 @@ public static EphtSubCountyOutputDto computeEphtSubCounty(StateCountyTractInputD
 
         input.applyRecodes();
 
-        if (input.hasInvalidStateCountyOrCensusTract(CensusTract.CENSUS_2010)) {
-            result.setEpht2010GeoId5k(EPHT_2010_GEO_ID_UNK_A);
-            result.setEpht2010GeoId20k(EPHT_2010_GEO_ID_UNK_A);
-            result.setEpht2010GeoId50k(EPHT_2010_GEO_ID_UNK_A);
+        if (input.hasInvalidStateCountyOrCensusTract(CensusTract.CENSUS_2020)) {
+            result.setEpht2020GeoId5k(EPHT_2020_GEO_ID_UNK_A);
+            result.setEpht2020GeoId20k(EPHT_2020_GEO_ID_UNK_A);
+            result.setEpht2020GeoId50k(EPHT_2020_GEO_ID_UNK_A);
         }
-        else if (input.hasUnknownStateCountyOrCensusTract(CensusTract.CENSUS_2010)) {
-            result.setEpht2010GeoId5k(EPHT_2010_GEO_ID_UNK_D);
-            result.setEpht2010GeoId20k(EPHT_2010_GEO_ID_UNK_D);
-            result.setEpht2010GeoId50k(EPHT_2010_GEO_ID_UNK_D);
+        else if (input.hasUnknownStateCountyOrCensusTract(CensusTract.CENSUS_2020)) {
+            result.setEpht2020GeoId5k(EPHT_2020_GEO_ID_UNK_D);
+            result.setEpht2020GeoId20k(EPHT_2020_GEO_ID_UNK_D);
+            result.setEpht2020GeoId50k(EPHT_2020_GEO_ID_UNK_D);
         }
         else if (input.countyIsNotReported()) {
-            result.setEpht2010GeoId5k(EPHT_2010_GEO_ID_UNK_B);
-            result.setEpht2010GeoId20k(EPHT_2010_GEO_ID_UNK_B);
-            result.setEpht2010GeoId50k(EPHT_2010_GEO_ID_UNK_B);
+            result.setEpht2020GeoId5k(EPHT_2020_GEO_ID_UNK_B);
+            result.setEpht2020GeoId20k(EPHT_2020_GEO_ID_UNK_B);
+            result.setEpht2020GeoId50k(EPHT_2020_GEO_ID_UNK_B);
         }
         else {
-            CensusData censusData = CountryData.getCensusData(input, CensusTract.CENSUS_2010);
+            CensusData censusData = CountryData.getCensusData(input, CensusTract.CENSUS_2020);
             if (censusData != null) {
-                result.setEpht2010GeoId5k(censusData.getEpht2010GeoId5k());
-                result.setEpht2010GeoId20k(censusData.getEpht2010GeoId20k());
-                result.setEpht2010GeoId50k(censusData.getEpht2010GeoId50k());
+                result.setEpht2020GeoId5k(censusData.getEpht2010GeoId5k());
+                result.setEpht2020GeoId20k(censusData.getEpht2010GeoId20k());
+                result.setEpht2020GeoId50k(censusData.getEpht2010GeoId50k());
             }
         }
 
-        if (result.getEpht2010GeoId5k() == null)
-            result.setEpht2010GeoId5k(EPHT_2010_GEO_ID_UNK_C);
-        if (result.getEpht2010GeoId20k() == null)
-            result.setEpht2010GeoId20k(EPHT_2010_GEO_ID_UNK_C);
-        if (result.getEpht2010GeoId50k() == null)
-            result.setEpht2010GeoId50k(EPHT_2010_GEO_ID_UNK_C);
+        if (result.getEpht2020GeoId5k() == null)
+            result.setEpht2020GeoId5k(EPHT_2020_GEO_ID_UNK_C);
+        if (result.getEpht2020GeoId20k() == null)
+            result.setEpht2020GeoId20k(EPHT_2020_GEO_ID_UNK_C);
+        if (result.getEpht2020GeoId50k() == null)
+            result.setEpht2020GeoId50k(EPHT_2020_GEO_ID_UNK_C);
 
         return result;
     }
diff --git a/src/main/java/com/imsweb/algorithms/internal/CensusData.java b/src/main/java/com/imsweb/algorithms/internal/CensusData.java
index df6e655..f1b71d0 100644
--- a/src/main/java/com/imsweb/algorithms/internal/CensusData.java
+++ b/src/main/java/com/imsweb/algorithms/internal/CensusData.java
@@ -32,11 +32,17 @@ public class CensusData {
     // poverty indicator data (2005-2007)
     private String _naaccrPovertyIndicator0507;
 
-    // Cancer Reporting Zone
-    private String _cancerReportingZone;
+    // Cancer Reporting Zone 2010
+    private String _cancerReportingZone2010;
 
-    // Cancer Reporting Zone Tract Certainty
-    private String _cancerReportingZoneTractCert;
+    // Cancer Reporting Zone Tract Certainty 2010
+    private String _cancerReportingZoneTractReq2010;
+
+    // Cancer Reporting Zone 2020
+    private String _cancerReportingZone2020;
+
+    // Cancer Reporting Zone Tract Certainty 2020
+    private String _cancerReportingZoneTractReq2020;
 
     // EPHT SubCounty 5K
     private String _epht2010GeoId5k;
@@ -59,8 +65,11 @@ public class CensusData {
     // Congressional district (119)
     private String _congressionalDistrict119;
 
-    // Persistent Poverty
-    private String _persistentPoverty;
+    // Persistent Poverty 2007-2011
+    private String _persistentPoverty0711;
+
+    // Persistent Poverty 2017-2021
+    private String _persistentPoverty1721;
 
     // year data keyed by DX year
     private final Map<String, YearData> _yearData = new HashMap<>();
@@ -153,20 +162,36 @@ public void setEpht2010GeoId50k(String epht2010GeoId50k) {
         _epht2010GeoId50k = epht2010GeoId50k;
     }
 
-    public String getCancerReportingZone() {
-        return _cancerReportingZone;
+    public String getCancerReportingZone2010() {
+        return _cancerReportingZone2010;
+    }
+
+    public void setCancerReportingZone2010(String cancerReportingZone2010) {
+        _cancerReportingZone2010 = cancerReportingZone2010;
+    }
+
+    public String getCancerReportingZoneTractReq2010() {
+        return _cancerReportingZoneTractReq2010;
     }
 
-    public void setCancerReportingZone(String cancerReportingZone) {
-        _cancerReportingZone = cancerReportingZone;
+    public void setCancerReportingZoneTractReq2010(String cancerReportingZoneTractReq2010) {
+        _cancerReportingZoneTractReq2010 = cancerReportingZoneTractReq2010;
     }
 
-    public String getCancerReportingZoneTractCert() {
-        return _cancerReportingZoneTractCert;
+    public String getCancerReportingZone2020() {
+        return _cancerReportingZone2020;
     }
 
-    public void setCancerReportingZoneTractCert(String cancerReportingZoneTractCert) {
-        _cancerReportingZoneTractCert = cancerReportingZoneTractCert;
+    public void setCancerReportingZone2020(String cancerReportingZone2020) {
+        _cancerReportingZone2020 = cancerReportingZone2020;
+    }
+
+    public String getCancerReportingZoneTractReq2020() {
+        return _cancerReportingZoneTractReq2020;
+    }
+
+    public void setCancerReportingZoneTractReq2020(String cancerReportingZoneTractReq2020) {
+        _cancerReportingZoneTractReq2020 = cancerReportingZoneTractReq2020;
     }
 
     public String getSviOverallStateBased2018() {
@@ -201,12 +226,20 @@ public void setCongressionalDistrict119(String congressionalDistrict119) {
         _congressionalDistrict119 = congressionalDistrict119;
     }
 
-    public String getPersistentPoverty() {
-        return _persistentPoverty;
+    public String getPersistentPoverty0711() {
+        return _persistentPoverty0711;
+    }
+
+    public void setPersistentPoverty0711(String persistentPoverty0711) {
+        _persistentPoverty0711 = persistentPoverty0711;
+    }
+
+    public String getPersistentPoverty1721() {
+        return _persistentPoverty1721;
     }
 
-    public void setPersistentPoverty(String persistentPoverty) {
-        _persistentPoverty = persistentPoverty;
+    public void setPersistentPoverty1721(String persistentPoverty1721) {
+        _persistentPoverty1721 = persistentPoverty1721;
     }
 
     /**
diff --git a/src/main/java/com/imsweb/algorithms/internal/CountryData.java b/src/main/java/com/imsweb/algorithms/internal/CountryData.java
index 9f757ac..40ac7ed 100644
--- a/src/main/java/com/imsweb/algorithms/internal/CountryData.java
+++ b/src/main/java/com/imsweb/algorithms/internal/CountryData.java
@@ -54,15 +54,17 @@ private CountryData() {
         _TRACT_FIELDS.put("stateAbbreviation", 2);
         _TRACT_FIELDS.put("countyFips", 3);
         _TRACT_FIELDS.put("censusTract", 6);
-        _TRACT_FIELDS.put("yearData", 518); // repeated data structure defined in "_TRACT_YEAR_BASED_FIELDS"; each year takes 37 characters, there are 14 years -> 518
+        _TRACT_FIELDS.put("yearData", 555); // repeated data structure defined in "_TRACT_YEAR_BASED_FIELDS"; each year takes 37 characters, there are 15 years -> 555
         _TRACT_FIELDS.put("ruca2000", 1);
         _TRACT_FIELDS.put("ruca2010", 1);
         _TRACT_FIELDS.put("ruca2020", 1);
         _TRACT_FIELDS.put("uric2000", 1);
         _TRACT_FIELDS.put("uric2010", 1);
         _TRACT_FIELDS.put("uric2020", 1);
-        _TRACT_FIELDS.put("cancerReportingZone", 10);
-        _TRACT_FIELDS.put("cancerReportingZoneTractCert", 1);
+        _TRACT_FIELDS.put("cancerReportingZone2010", 10);
+        _TRACT_FIELDS.put("cancerReportingZoneTractReq2010", 1);
+        _TRACT_FIELDS.put("cancerReportingZone2020", 10);
+        _TRACT_FIELDS.put("cancerReportingZoneTractReq2020", 1);
         _TRACT_FIELDS.put("naaccrPovertyIndicator9504", 1);
         _TRACT_FIELDS.put("naaccrPovertyIndicator0507", 1);
         _TRACT_FIELDS.put("npcrEphtSubcounty5k", 11);
@@ -72,7 +74,8 @@ private CountryData() {
         _TRACT_FIELDS.put("sviOverallStateBased2022", 5);
         _TRACT_FIELDS.put("congressionalDistrict118", 4);
         _TRACT_FIELDS.put("congressionalDistrict119", 4);
-        _TRACT_FIELDS.put("persistentPoverty", 1);
+        _TRACT_FIELDS.put("persistentPoverty0711", 1);
+        _TRACT_FIELDS.put("persistentPoverty1721", 1);
     }
 
     public static Map<String, Integer> getTractFields() {
@@ -98,7 +101,7 @@ public static Map<String, Integer> getTractYearBasedFields() {
     }
 
     public static final int TRACT_YEAR_MIN_VAL = 2008;
-    public static final int TRACT_YEAR_MAX_VAL = 2021;
+    public static final int TRACT_YEAR_MAX_VAL = 2022;
 
     public static CensusData getCensusData(StateCountyTractInputDto input, CensusTract censusTract) {
         if (!CountryData.getInstance().isTractDataInitialized(input.getAddressAtDxState()))
@@ -224,8 +227,10 @@ public void initializeTractData(String requestedState) {
                                 censusData.setEpht2010GeoId50k(StringUtils.leftPad(StringUtils.trimToNull(values.get("npcrEphtSubcounty50k")), 11, '0'));
 
                                 // Cancer Reporting Zone
-                                censusData.setCancerReportingZone(StringUtils.trimToNull(values.get("cancerReportingZone")));
-                                censusData.setCancerReportingZoneTractCert(StringUtils.trimToNull(values.get("cancerReportingZoneTractCert")));
+                                censusData.setCancerReportingZone2010(StringUtils.trimToNull(values.get("cancerReportingZone2010")));
+                                censusData.setCancerReportingZoneTractReq2010(StringUtils.trimToNull(values.get("cancerReportingZoneTractReq2010")));
+                                censusData.setCancerReportingZone2020(StringUtils.trimToNull(values.get("cancerReportingZone2020")));
+                                censusData.setCancerReportingZoneTractReq2020(StringUtils.trimToNull(values.get("cancerReportingZoneTractReq2020")));
 
                                 // Social Vulnerability Index (SVI)
                                 censusData.setSviOverallStateBased2018(StringUtils.trimToNull(values.get("sviOverallStateBased2018")));
@@ -236,7 +241,8 @@ public void initializeTractData(String requestedState) {
                                 censusData.setCongressionalDistrict119(StringUtils.trimToNull(values.get("congressionalDistrict119")));
 
                                 // persistence poverty
-                                censusData.setPersistentPoverty(StringUtils.trimToNull(values.get("persistentPoverty")));
+                                censusData.setPersistentPoverty0711(StringUtils.trimToNull(values.get("persistentPoverty0711")));
+                                censusData.setPersistentPoverty1721(StringUtils.trimToNull(values.get("persistentPoverty1721")));
                             }
 
                             line = reader.readLine();
diff --git a/src/main/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithm.java b/src/main/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithm.java
index 00ecc0e..bf39e6d 100644
--- a/src/main/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithm.java
+++ b/src/main/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithm.java
@@ -20,8 +20,10 @@
 
 import static com.imsweb.algorithms.Algorithms.ALG_PERSISTENT_POVERTY;
 import static com.imsweb.algorithms.Algorithms.FIELD_CENSUS_2010;
+import static com.imsweb.algorithms.Algorithms.FIELD_CENSUS_2020;
 import static com.imsweb.algorithms.Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS;
-import static com.imsweb.algorithms.Algorithms.FIELD_PERSISTENT_POVERTY;
+import static com.imsweb.algorithms.Algorithms.FIELD_PERSISTENT_POVERTY_0711;
+import static com.imsweb.algorithms.Algorithms.FIELD_PERSISTENT_POVERTY_1721;
 import static com.imsweb.algorithms.Algorithms.FIELD_STATE_DX;
 
 public class PersistentPovertyAlgorithm extends AbstractAlgorithm {
@@ -32,15 +34,17 @@ public class PersistentPovertyAlgorithm extends AbstractAlgorithm {
     public static final String PERSISTENT_POVERTY_UNK_D = "D";
 
     public PersistentPovertyAlgorithm() {
-        super(ALG_PERSISTENT_POVERTY, "Persistent Poverty", "v1 released by USDA on 12/08/2023");
+        super(ALG_PERSISTENT_POVERTY, "Persistent Poverty", "August 21, 2026");
 
         _url = "https://www.ers.usda.gov/data-products/poverty-area-measures/";
 
         _inputFields.add(Algorithms.getField(FIELD_STATE_DX));
         _inputFields.add(Algorithms.getField(FIELD_COUNTY_AT_DX_ANALYSIS));
         _inputFields.add(Algorithms.getField(FIELD_CENSUS_2010));
+        _inputFields.add(Algorithms.getField(FIELD_CENSUS_2020));
 
-        _outputFields.add(Algorithms.getField(FIELD_PERSISTENT_POVERTY));
+        _outputFields.add(Algorithms.getField(FIELD_PERSISTENT_POVERTY_0711));
+        _outputFields.add(Algorithms.getField(FIELD_PERSISTENT_POVERTY_1721));
     }
 
     @Override
@@ -48,31 +52,42 @@ public AlgorithmOutput execute(AlgorithmInput input) {
         List<Map<String, Object>> outputTumors = new ArrayList<>();
         for (Map<String, Object> inputTumor : Utils.extractTumors(input)) {
             StateCountyTractInputDto inputDto = createStateCountyTractInputDto(inputTumor);
-            
-            inputDto.applyRecodes();
-
-            String result = null;
-            if (inputDto.hasInvalidStateCountyOrCensusTract(CensusTract.CENSUS_2010))
-                result = PERSISTENT_POVERTY_UNK_A;
-            else if (inputDto.hasUnknownStateCountyOrCensusTract(CensusTract.CENSUS_2010))
-                result = PERSISTENT_POVERTY_UNK_D;
-            else if (inputDto.countyIsNotReported())
-                result = PERSISTENT_POVERTY_UNK_B;
-            else {
-                CensusData censusData = CountryData.getCensusData(inputDto, CensusTract.CENSUS_2010);
-                if (censusData != null)
-                    result = censusData.getPersistentPoverty();
-            }
 
-            if (result == null)
-                result = PERSISTENT_POVERTY_UNK_C;
+            inputDto.applyRecodes();
 
             Map<String, Object> outputTumor = new HashMap<>();
-            outputTumor.put(FIELD_PERSISTENT_POVERTY, result);
+            outputTumor.put(FIELD_PERSISTENT_POVERTY_0711, computeValue(inputDto, CensusTract.CENSUS_2010));
+            outputTumor.put(FIELD_PERSISTENT_POVERTY_1721, computeValue(inputDto, CensusTract.CENSUS_2020));
 
             outputTumors.add(outputTumor);
         }
 
         return AlgorithmOutput.of(outputTumors);
     }
+
+    private String computeValue(StateCountyTractInputDto inputDto, CensusTract census) {
+        String result = null;
+        if (inputDto.hasInvalidStateCountyOrCensusTract(census))
+            result = PERSISTENT_POVERTY_UNK_A;
+        else if (inputDto.hasUnknownStateCountyOrCensusTract(census))
+            result = PERSISTENT_POVERTY_UNK_D;
+        else if (inputDto.countyIsNotReported())
+            result = PERSISTENT_POVERTY_UNK_B;
+        else {
+            CensusData censusData = CountryData.getCensusData(inputDto, census);
+            if (censusData != null) {
+                if (census == CensusTract.CENSUS_2010)
+                    result = censusData.getPersistentPoverty0711();
+                else if (census == CensusTract.CENSUS_2020)
+                    result = censusData.getPersistentPoverty1721();
+                else
+                    throw new IllegalStateException("Invalid census: " + census);
+            }
+        }
+
+        if (result == null)
+            result = PERSISTENT_POVERTY_UNK_C;
+
+        return result;
+    }
 }
diff --git a/src/main/resources/tract/tract-data.txt.gz b/src/main/resources/tract/tract-data.txt.gz
index 002bf3a..28bde46 100644
Binary files a/src/main/resources/tract/tract-data.txt.gz and b/src/main/resources/tract/tract-data.txt.gz differ
diff --git a/src/test/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtilsTest.java b/src/test/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtilsTest.java
index 149c7f6..d317e43 100644
--- a/src/test/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtilsTest.java
+++ b/src/test/java/com/imsweb/algorithms/cancerreportingzone/CancerReportingZoneUtilsTest.java
@@ -26,16 +26,20 @@ public void testComputeTractEstCongressDist() {
         // test a SEER city recode
         input.setAddressAtDxState("LO");
         input.setCountyAtDxAnalysis("071");
-        input.setCensusTract2010("007903");
-        Assert.assertEquals("06A0274ca", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
-        Assert.assertEquals("1", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq());
+        input.setCensusTract2020("007903");
+        Assert.assertEquals("06A0274ca", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+        Assert.assertEquals("1", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq2010());
+        Assert.assertEquals("06A9357za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+        Assert.assertEquals("1", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq2020());
 
         // test Puerto Rico
         input.setAddressAtDxState("PR");
         input.setCountyAtDxAnalysis("001");
-        input.setCensusTract2010("956300");
-        Assert.assertEquals("C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
-        Assert.assertEquals("C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq());
+        input.setCensusTract2020("956300");
+        Assert.assertEquals("C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+        Assert.assertEquals("C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq2010());
+        Assert.assertEquals("C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+        Assert.assertEquals("C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq2020());
 
         // test unknown A (state, county, or tract are invalid)
         for (String state : Arrays.asList("WA", "INVALID")) {
@@ -43,13 +47,17 @@ public void testComputeTractEstCongressDist() {
                 for (String tract : Arrays.asList("012720", "INVALID")) {
                     input.setAddressAtDxState(state);
                     input.setCountyAtDxAnalysis(county);
-                    input.setCensusTract2010(tract);
+                    input.setCensusTract2020(tract);
                     String key = String.format("%s|%s|%s", state, county, tract);
 
-                    if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract))
-                        Assert.assertEquals(key, "53A9071za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
-                    else
-                        Assert.assertEquals(key, "A", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
+                    if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract)) {
+                        Assert.assertEquals(key, "53A9071za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+                        Assert.assertEquals(key, "53", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+                    }
+                    else {
+                        Assert.assertEquals(key, "A", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+                        Assert.assertEquals(key, "A", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+                    }
                 }
             }
         }
@@ -57,9 +65,11 @@ public void testComputeTractEstCongressDist() {
         // test unknown B (county was not reported)
         input.setAddressAtDxState("WA");
         input.setCountyAtDxAnalysis("000");
-        input.setCensusTract2010("012720");
-        Assert.assertEquals("B", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
-        Assert.assertEquals("B", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq());
+        input.setCensusTract2020("012720");
+        Assert.assertEquals("B", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+        Assert.assertEquals("B", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq2010());
+        Assert.assertEquals("B", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+        Assert.assertEquals("B", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZoneTractReq2020());
 
         //test unknown C (the state+county+tract combination was not found in lookup table or there was a blank entry in the table)
         for (String state : Arrays.asList("WA", "SK")) {
@@ -67,13 +77,17 @@ public void testComputeTractEstCongressDist() {
                 for (String tract : Arrays.asList("012720", "555555")) {
                     input.setAddressAtDxState(state);
                     input.setCountyAtDxAnalysis(county);
-                    input.setCensusTract2010(tract);
+                    input.setCensusTract2020(tract);
                     String key = String.format("%s|%s|%s", state, county, tract);
 
-                    if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract))
-                        Assert.assertEquals(key, "53A9071za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
-                    else
-                        Assert.assertEquals(key, "C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
+                    if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract)) {
+                        Assert.assertEquals(key, "53A9071za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+                        Assert.assertEquals(key, "53", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+                    }
+                    else {
+                        Assert.assertEquals(key, "C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+                        Assert.assertEquals(key, "C", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+                    }
                 }
             }
         }
@@ -84,13 +98,17 @@ public void testComputeTractEstCongressDist() {
                 for (String tract : Arrays.asList("012720", "999999", null)) {
                     input.setAddressAtDxState(state);
                     input.setCountyAtDxAnalysis(county);
-                    input.setCensusTract2010(tract);
+                    input.setCensusTract2020(tract);
                     String key = String.format("%s|%s|%s", state, county, tract);
 
-                    if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract))
-                        Assert.assertEquals(key, "53A9071za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
-                    else
-                        Assert.assertEquals(key, "D", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone());
+                    if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract)) {
+                        Assert.assertEquals(key, "53A9071za", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+                        Assert.assertEquals(key, "53", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+                    }
+                    else {
+                        Assert.assertEquals(key, "D", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2010());
+                        Assert.assertEquals(key, "D", CancerReportingZoneUtils.computeCancerReportingZone(input).getCancerReportingZone2020());
+                    }
                 }
             }
         }
diff --git a/src/test/java/com/imsweb/algorithms/censustractpovertyindicator/CensusTractPovertyIndicatorUtilsTest.java b/src/test/java/com/imsweb/algorithms/censustractpovertyindicator/CensusTractPovertyIndicatorUtilsTest.java
index c04faaa..a111d05 100644
--- a/src/test/java/com/imsweb/algorithms/censustractpovertyindicator/CensusTractPovertyIndicatorUtilsTest.java
+++ b/src/test/java/com/imsweb/algorithms/censustractpovertyindicator/CensusTractPovertyIndicatorUtilsTest.java
@@ -112,10 +112,10 @@ public void testComputePovertyIndicator() {
         rec.put("censusTract2020", "020600");
         rec.put("dateOfDiagnosisYear", "2021");
         Assert.assertEquals("2", computePovertyIndicator(rec).getCensusTractPovertyIndicator());
-        // test 2025 (census2020) - note: this may fail once 2022 data is added to the SEER big data file (2020 geographies)
+        // test 2025 (census2020)
         rec.put("censusTract2020", "020600");
         rec.put("dateOfDiagnosisYear", "2025");
-        Assert.assertEquals("9", computePovertyIndicator(rec).getCensusTractPovertyIndicator());
+        Assert.assertEquals("3", computePovertyIndicator(rec).getCensusTractPovertyIndicator());
         //test unknown year
         rec.put("dateOfDiagnosisYear", "9999");
         Assert.assertEquals("9", computePovertyIndicator(rec).getCensusTractPovertyIndicator());
diff --git a/src/test/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtilsTest.java b/src/test/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtilsTest.java
index 1b9701d..97e3058 100644
--- a/src/test/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtilsTest.java
+++ b/src/test/java/com/imsweb/algorithms/ephtsubcounty/EphtSubCountyUtilsTest.java
@@ -25,18 +25,18 @@ public void testComputeEphtSubCounty() {
         // test a SEER city recode
         input.setAddressAtDxState("LO");
         input.setCountyAtDxAnalysis("071");
-        input.setCensusTract2010("007903");
-        Assert.assertEquals("00060713015", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-        Assert.assertEquals("00060713188", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-        Assert.assertEquals("00060717452", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+        input.setCensusTract2020("007903");
+        Assert.assertEquals("00060710132", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+        Assert.assertEquals("00060713913", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+        Assert.assertEquals("00060717176", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
 
         // test Puerto Rico
         input.setAddressAtDxState("PR");
         input.setCountyAtDxAnalysis("001");
-        input.setCensusTract2010("956300");
-        Assert.assertEquals("00072001217", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-        Assert.assertEquals("00000072001", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-        Assert.assertEquals("00007201121", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+        input.setCensusTract2020("956300");
+        Assert.assertEquals("C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+        Assert.assertEquals("C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+        Assert.assertEquals("C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
 
         // test unknown A (state, county, or tract are invalid)
         for (String state : Arrays.asList("WA", "INVALID")) {
@@ -44,18 +44,18 @@ public void testComputeEphtSubCounty() {
                 for (String tract : Arrays.asList("012720", "INVALID")) {
                     input.setAddressAtDxState(state);
                     input.setCountyAtDxAnalysis(county);
-                    input.setCensusTract2010(tract);
+                    input.setCensusTract2020(tract);
                     String key = String.format("%s|%s|%s", state, county, tract);
 
                     if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract)) {
-                        Assert.assertEquals(key, "00005306787", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-                        Assert.assertEquals(key, "00053067466", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-                        Assert.assertEquals(key, "00530671089", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+                        Assert.assertEquals(key, "53067012720", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+                        Assert.assertEquals(key, "00530675647", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+                        Assert.assertEquals(key, "00530671456", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
                     }
                     else {
-                        Assert.assertEquals(key, "A", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-                        Assert.assertEquals(key, "A", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-                        Assert.assertEquals(key, "A", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+                        Assert.assertEquals(key, "A", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+                        Assert.assertEquals(key, "A", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+                        Assert.assertEquals(key, "A", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
                     }
                 }
             }
@@ -64,10 +64,10 @@ public void testComputeEphtSubCounty() {
         // test unknown B (county was not reported)
         input.setAddressAtDxState("WA");
         input.setCountyAtDxAnalysis("000");
-        input.setCensusTract2010("012720");
-        Assert.assertEquals("B", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-        Assert.assertEquals("B", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-        Assert.assertEquals("B", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+        input.setCensusTract2020("012720");
+        Assert.assertEquals("B", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+        Assert.assertEquals("B", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+        Assert.assertEquals("B", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
 
         //test unknown C (the state+county+tract combination was not found in lookup table or there was a blank entry in the table)
         for (String state : Arrays.asList("WA", "SK")) {
@@ -75,18 +75,18 @@ public void testComputeEphtSubCounty() {
                 for (String tract : Arrays.asList("012720", "555555")) {
                     input.setAddressAtDxState(state);
                     input.setCountyAtDxAnalysis(county);
-                    input.setCensusTract2010(tract);
+                    input.setCensusTract2020(tract);
                     String key = String.format("%s|%s|%s", state, county, tract);
 
                     if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract)) {
-                        Assert.assertEquals(key, "00005306787", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-                        Assert.assertEquals(key, "00053067466", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-                        Assert.assertEquals(key, "00530671089", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+                        Assert.assertEquals(key, "53067012720", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+                        Assert.assertEquals(key, "00530675647", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+                        Assert.assertEquals(key, "00530671456", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
                     }
                     else {
-                        Assert.assertEquals(key, "C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-                        Assert.assertEquals(key, "C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-                        Assert.assertEquals(key, "C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+                        Assert.assertEquals(key, "C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+                        Assert.assertEquals(key, "C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+                        Assert.assertEquals(key, "C", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
                     }
                 }
             }
@@ -98,18 +98,18 @@ public void testComputeEphtSubCounty() {
                 for (String tract : Arrays.asList("012720", "999999", null)) {
                     input.setAddressAtDxState(state);
                     input.setCountyAtDxAnalysis(county);
-                    input.setCensusTract2010(tract);
+                    input.setCensusTract2020(tract);
                     String key = String.format("%s|%s|%s", state, county, tract);
 
                     if ("WA".equals(state) && "067".equals(county) && "012720".equals(tract)) {
-                        Assert.assertEquals(key, "00005306787", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-                        Assert.assertEquals(key, "00053067466", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-                        Assert.assertEquals(key, "00530671089", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+                        Assert.assertEquals(key, "53067012720", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+                        Assert.assertEquals(key, "00530675647", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+                        Assert.assertEquals(key, "00530671456", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
                     }
                     else {
-                        Assert.assertEquals(key, "D", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId5k());
-                        Assert.assertEquals(key, "D", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId20k());
-                        Assert.assertEquals(key, "D", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2010GeoId50k());
+                        Assert.assertEquals(key, "D", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId5k());
+                        Assert.assertEquals(key, "D", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId20k());
+                        Assert.assertEquals(key, "D", EphtSubCountyUtils.computeEphtSubCounty(input).getEpht2020GeoId50k());
                     }
                 }
             }
diff --git a/src/test/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithmTest.java b/src/test/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithmTest.java
index 93aa6c3..6e5ab8a 100644
--- a/src/test/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithmTest.java
+++ b/src/test/java/com/imsweb/algorithms/persistentpoverty/PersistentPovertyAlgorithmTest.java
@@ -29,11 +29,14 @@ public void testExecute() {
         input.setPatient(patMap);
         Map<String, Object> tumMap = new HashMap<>();
         tumMap.put(Algorithms.FIELD_STATE_DX, "AL");
-        tumMap.put(Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS, "001");
+        tumMap.put(Algorithms.FIELD_COUNTY_AT_DX_ANALYSIS, "057");
         tumMap.put(Algorithms.FIELD_CENSUS_2010, "020200");
+        tumMap.put(Algorithms.FIELD_CENSUS_2020, "020200");
         patMap.put(Algorithms.FIELD_TUMORS, Collections.singletonList(tumMap));
 
-        Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).get(0).get(Algorithms.FIELD_PERSISTENT_POVERTY));
+        // that combination of input computes a value that is different in each of the data file...
+        Assert.assertEquals("2", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_PERSISTENT_POVERTY_0711));
+        Assert.assertEquals("0", Utils.extractTumors(alg.execute(input).getPatient()).getFirst().get(Algorithms.FIELD_PERSISTENT_POVERTY_1721));
     }
 
 }
diff --git a/src/test/java/com/imsweb/algorithms/yostacspoverty/YostAcsPovertyUtilsTest.java b/src/test/java/com/imsweb/algorithms/yostacspoverty/YostAcsPovertyUtilsTest.java
index a2afe92..7818348 100644
--- a/src/test/java/com/imsweb/algorithms/yostacspoverty/YostAcsPovertyUtilsTest.java
+++ b/src/test/java/com/imsweb/algorithms/yostacspoverty/YostAcsPovertyUtilsTest.java
@@ -337,21 +337,20 @@ public void testYostAcsPoverty() {
         Assert.assertEquals("8.09", odto.getAcsPctPovHispanic());
 
         // 2025 using census2020 with yearForLookup 2022
-        // note: this may fail once 2022 data is added to the big SEER data file
         idto.setAddressAtDxState("AK");
         idto.setCountyAtDxAnalysis("020");
         idto.setCensusTract2010("");
         idto.setCensusTract2020("001702");
         idto.setDateOfDiagnosis("2025");
         odto = YostAcsPovertyUtils.computeYostAcsPovertyData(idto);
-        Assert.assertEquals("C", odto.getYostQuintileUS());
-        Assert.assertEquals("C", odto.getYostQuintileState());
-        Assert.assertEquals("C", odto.getAcsPctPovAllRaces());
-        Assert.assertEquals("C", odto.getAcsPctPovWhite());
-        Assert.assertEquals("C", odto.getAcsPctPovBlack());
-        Assert.assertEquals("C", odto.getAcsPctPovAIAN());
-        Assert.assertEquals("C", odto.getAcsPctPovAsianNHOPI());
-        Assert.assertEquals("C", odto.getAcsPctPovWhiteNonHisp());
-        Assert.assertEquals("C", odto.getAcsPctPovHispanic());
+        Assert.assertEquals("4", odto.getYostQuintileUS());
+        Assert.assertEquals("4", odto.getYostQuintileState());
+        Assert.assertEquals("7.11", odto.getAcsPctPovAllRaces());
+        Assert.assertEquals("4.10", odto.getAcsPctPovWhite());
+        Assert.assertEquals("20.44", odto.getAcsPctPovBlack());
+        Assert.assertEquals("25.73", odto.getAcsPctPovAIAN());
+        Assert.assertEquals("0.00", odto.getAcsPctPovAsianNHOPI());
+        Assert.assertEquals("4.19", odto.getAcsPctPovWhiteNonHisp());
+        Assert.assertEquals("6.52", odto.getAcsPctPovHispanic());
     }
 }
diff --git a/src/test/java/lab/TractDataLab.java b/src/test/java/lab/TractDataLab.java
index 0ce2f05..dc2ef58 100644
--- a/src/test/java/lab/TractDataLab.java
+++ b/src/test/java/lab/TractDataLab.java
@@ -131,20 +131,21 @@ public static void main(String[] args) throws IOException {
         try (InputStream fis = Thread.currentThread().getContextClassLoader().getResourceAsStream("tract/time-dependent-tract-data-layout-2022.xml")) {
             layout2022 = new FixedColumnsLayout(LayoutUtils.readFixedColumnsLayout(fis));
         }
-        FixedColumnsLayout layout2025;
-        try (InputStream fis = Thread.currentThread().getContextClassLoader().getResourceAsStream("tract/time-dependent-tract-data-layout-2025.xml")) {
-            layout2025 = new FixedColumnsLayout(LayoutUtils.readFixedColumnsLayout(fis));
+        FixedColumnsLayout layout2026;
+        try (InputStream fis = Thread.currentThread().getContextClassLoader().getResourceAsStream("tract/time-dependent-tract-data-layout-2026.xml")) {
+            layout2026 = new FixedColumnsLayout(LayoutUtils.readFixedColumnsLayout(fis));
         }
 
         // load the data from the big SEER tract data file (it was not added to the project, too big)
         //    https://seer.cancer.gov/seerstat/variables/countyattribs/census-tract-attribs.html
         // 8/15/22 - new version of the SEER data was provided, but it's not posted online yet; a Puerto-Rico version of the data file was also provided (it won't be posted)
         // 8/29/25 - an extra version of the SEER data was provided for years 2018-2021, using census2020 boundaries; Puerto-Rico file not available yet.
+        // 8/21/26 - new version of the 2008-2017 file (no format change, Puerto-Rico didn't change); new version of the 2018-2022 file (unreleased, format changed, no Puerto-Rico).
         Map<DataKey, Map<String, String>> tractValues = new TreeMap<>();
         Map<DataKey, Map<Integer, String>> tractYearBasedValues = new HashMap<>();
-        processMainSeerDataFile_2008_2017(Paths.get("D:\\temp\\tract.level.ses.2008_17.txt.gz"), layout2022, tractValues, tractYearBasedValues);
+        processMainSeerDataFile_2008_2017(Paths.get("D:\\temp\\tract.level.ses.2008_17.dt20260819.gz"), layout2022, tractValues, tractYearBasedValues);
         processMainSeerDataFile_2008_2017(Paths.get("D:\\temp\\tract.level.ses.2008_17.puerto.rico.dt20230818.txt.gz"), layout2022, tractValues, tractYearBasedValues);
-        processMainSeerDataFile_2018_2021(Paths.get("D:\\temp\\tract.level.ses.2018_21.vint2023.pops.dat.txd.gz"), layout2025, tractValues, tractYearBasedValues);
+        processMainSeerDataFile_2018_2022(Paths.get("D:\\temp\\tract.level.ses.2018_22.dt20260819.not.public.with.cdc_geos.gz"), layout2026, tractValues, tractYearBasedValues);
 
         // NAACCR Poverty Indicator 1995-2004
         Map<DataKey, String> naaccrPovertyIndicator9504 = new HashMap<>();
@@ -230,31 +231,32 @@ else if (urbanCommutingAreas.contains(secondary))
                 // also, most fields come from the big shared SEER data file, those don't have their own if/else statements
                 for (String field : CountryData.getTractFields().keySet()) {
                     if ("stateAbbreviation".equals(field))
-                        buf.append(key.getState());
+                        addToBuffer(buf, key.getState(), key, field);
                     else if ("countyFips".equals(field))
-                        buf.append(key.getCounty());
+                        addToBuffer(buf, key.getCounty(), key, field);
                     else if ("censusTract".equals(field))
-                        buf.append(key.getTract());
+                        addToBuffer(buf, key.getTract(), key, field);
                     else if ("naaccrPovertyIndicator9504".equals(field))
-                        buf.append(naaccrPovertyIndicator9504.getOrDefault(key, " "));
+                        addToBuffer(buf, naaccrPovertyIndicator9504.getOrDefault(key, " "), key, field);
                     else if ("naaccrPovertyIndicator0507".equals(field))
-                        buf.append(naaccrPovertyIndicator0507.getOrDefault(key, " "));
+                        addToBuffer(buf, naaccrPovertyIndicator0507.getOrDefault(key, " "), key, field);
                     else if ("ruca2000".equals(field))
-                        buf.append(ruca2000Values.getOrDefault(key, " "));
+                        addToBuffer(buf, ruca2000Values.getOrDefault(key, " "), key, field);
                     else if ("uric2000".equals(field))
-                        buf.append(uric2000Values.getOrDefault(key, " "));
+                        addToBuffer(buf, uric2000Values.getOrDefault(key, " "), key, field);
                     else if ("yearData".equals(field)) {
                         Map<Integer, String> yearData = tractYearBasedValues.get(key);
                         if (yearData != null) {
                             for (Integer year : IntStream.rangeClosed(CountryData.TRACT_YEAR_MIN_VAL, CountryData.TRACT_YEAR_MAX_VAL).boxed().toList())
-                                buf.append(yearData.getOrDefault(year, StringUtils.rightPad("", CountryData.getTractYearBasedFields().values().stream().mapToInt(Integer::intValue).sum(), " ")));
+                                addToBuffer(buf, yearData.getOrDefault(year, StringUtils.rightPad("", CountryData.getTractYearBasedFields().values().stream().mapToInt(Integer::intValue).sum(), " ")),
+                                        key, field);
                         }
                         else
-                            buf.append(StringUtils.rightPad("", CountryData.getTractFields().get(field), " "));
+                            addToBuffer(buf, StringUtils.rightPad("", CountryData.getTractFields().get(field), " "), key, field);
                     }
                     else {
                         String val = tractValues.getOrDefault(key, new HashMap<>()).getOrDefault(field, "");
-                        buf.append(StringUtils.rightPad(val, CountryData.getTractFields().get(field), " "));
+                        addToBuffer(buf, StringUtils.rightPad(val, CountryData.getTractFields().get(field), " "), key, field);
                     }
                 }
 
@@ -270,6 +272,13 @@ else if ("yearData".equals(field)) {
         }
     }
 
+    @SuppressWarnings("unused")
+    private static void addToBuffer(StringBuilder buf, String value, DataKey key, String field) {
+        //if (key.getState().equals("AL") && key.getCounty().equals("057") && key.getTract().equals("020200"))
+        //System.out.println(key.getState() + "/" + key.getCounty() + "/" + key.getTract() + " - " + field  + ": " + value);
+        buf.append(value);
+    }
+
     private static String cleanTractValue(int lineNum, Map<String, String> line, String sourceField, String targetField) {
         return cleanTractValue(lineNum, line, sourceField, targetField, null);
     }
@@ -332,22 +341,22 @@ private static void processMainSeerDataFile_2008_2017(Path inputFile, FixedColum
 
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("ruca2010", cleanTractValue(lineNum, line, "ruca2010C", "ruca2010"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("uric2010", cleanTractValue(lineNum, line, "uric2010A", "uric2010"));
-                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZone", cleanTractValue(lineNum, line, "zoneId", "cancerReportingZone"));
-                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZoneTractCert", cleanTractValue(lineNum, line, "zoneTractCertainty", "cancerReportingZoneTractCert"));
-                // commented out the EPHT Subcounty for 2010 geographies, we are now using the 2020 geographies for those...
+                // commented out the Cancer Reporting Zone and EPHT Subcounty for 2010 geographies, we are now using the 2020 geographies for those...
+                //tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZone", cleanTractValue(lineNum, line, "zoneId", "cancerReportingZone"));
+                //tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZoneTractReq", cleanTractValue(lineNum, line, "zoneTractRequired", "cancerReportingZoneTractReq"));
                 //tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("npcrEphtSubcounty5k", cleanTractValue(lineNum, line, "cdcSubcounty5k", "npcrEphtSubcounty5k"));
                 //tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("npcrEphtSubcounty20k", cleanTractValue(lineNum, line, "cdcSubcounty20k", "npcrEphtSubcounty20k"));
                 //tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("npcrEphtSubcounty50k", cleanTractValue(lineNum, line, "cdcSubcounty50k", "npcrEphtSubcounty50k"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("sviOverallStateBased2018", cleanTractValue(lineNum, line, "sviOverallState2018", "sviOverallStateBased2018"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("congressionalDistrict118", cleanTractValue(lineNum, line, "congressionalDistrict118", "congressionalDistrict118"));
-                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("persistentPoverty", cleanTractValue(lineNum, line, "persistentPoverty", "persistentPoverty"));
+                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("persistentPoverty0711", cleanTractValue(lineNum, line, "persistentPoverty", "persistentPoverty0711"));
 
                 line = layout.readNextRecord(reader);
             }
         }
     }
 
-    private static void processMainSeerDataFile_2018_2021(Path inputFile, FixedColumnsLayout layout, Map<DataKey, Map<String, String>> tractValues, Map<DataKey, Map<Integer, String>> tractYearBasedValues) throws IOException {
+    private static void processMainSeerDataFile_2018_2022(Path inputFile, FixedColumnsLayout layout, Map<DataKey, Map<String, String>> tractValues, Map<DataKey, Map<Integer, String>> tractYearBasedValues) throws IOException {
         try (LineNumberReader reader = new LineNumberReader(new InputStreamReader(new GZIPInputStream(Files.newInputStream(inputFile)), StandardCharsets.US_ASCII))) {
 
             Map<String, String> line = layout.readNextRecord(reader);
@@ -386,14 +395,18 @@ private static void processMainSeerDataFile_2018_2021(Path inputFile, FixedColum
 
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("ruca2020", cleanTractValue(lineNum, line, "ruca2020C", "ruca2020"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("uric2020", cleanTractValue(lineNum, line, "uric2020A", "uric2020"));
-                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZone", cleanTractValue(lineNum, line, "zoneId", "cancerReportingZone"));
-                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZoneTractCert", cleanTractValue(lineNum, line, "zoneTractCertainty", "cancerReportingZoneTractCert"));
+                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZone2010", cleanTractValue(lineNum, line, "zoneId2010", "cancerReportingZone2010"));
+                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZoneTractReq2010",
+                        cleanTractValue(lineNum, line, "zoneTractRequired2010", "cancerReportingZoneTractReq2010"));
+                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZone2020", cleanTractValue(lineNum, line, "zoneId2020", "cancerReportingZone2020"));
+                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("cancerReportingZoneTractReq2020",
+                        cleanTractValue(lineNum, line, "zoneTractRequired2020", "cancerReportingZoneTractReq2020"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("npcrEphtSubcounty5k", cleanTractValue(lineNum, line, "cdcSubcounty5k", "npcrEphtSubcounty5k"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("npcrEphtSubcounty20k", cleanTractValue(lineNum, line, "cdcSubcounty20k", "npcrEphtSubcounty20k"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("npcrEphtSubcounty50k", cleanTractValue(lineNum, line, "cdcSubcounty50k", "npcrEphtSubcounty50k"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("sviOverallStateBased2022", cleanTractValue(lineNum, line, "sviOverallState2022", "sviOverallStateBased2022"));
                 tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("congressionalDistrict119", cleanTractValue(lineNum, line, "congressionalDistrict119", "congressionalDistrict119"));
-                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("persistentPoverty", cleanTractValue(lineNum, line, "persistentPoverty", "persistentPoverty"));
+                tractValues.computeIfAbsent(key, k -> new HashMap<>()).put("persistentPoverty1721", cleanTractValue(lineNum, line, "persistentPoverty", "persistentPoverty1721"));
 
                 line = layout.readNextRecord(reader);
             }
diff --git a/src/test/resources/cancerreportingzone/cancer-reporting-zones.csv b/src/test/resources/cancerreportingzone/cancer-reporting-zones.csv
index 6508835..e05ca59 100644
--- a/src/test/resources/cancerreportingzone/cancer-reporting-zones.csv
+++ b/src/test/resources/cancerreportingzone/cancer-reporting-zones.csv
@@ -1,4 +1,4 @@
-state,county,censusTract,cancerReportZone,cancerReportingZoneTractCert
+state,county,censusTract,cancerReportZone,cancerReportingZoneTractReq
 CA,001,400100,A0590,1
 CA,001,400200,A0847,1
 CA,001,400300,A0847,1
diff --git a/src/test/resources/tract/time-dependent-tract-data-layout-2022.xml b/src/test/resources/tract/time-dependent-tract-data-layout-2022.xml
index bd95d40..e5d3aab 100644
--- a/src/test/resources/tract/time-dependent-tract-data-layout-2022.xml
+++ b/src/test/resources/tract/time-dependent-tract-data-layout-2022.xml
@@ -34,7 +34,7 @@
 	<field name="uric2010C" start="136" end="136" long-label="2010 Census-based Urban Rural Indicator Codes (URIC) categorization C"/>
 	<field name="woodsAndPoole2019" start="137" end="146" long-label="Woods and Poole Tract Population Vintage 2019"/>
 	<field name="zoneId" start="147" end="156" long-label="Zone ID"/>
-	<field name="zoneTractCertainty" start="157" end="157" long-label="Zone Tract Certainty"/>
+	<field name="zoneTractRequired" start="157" end="157" long-label="Zone Tract Required"/>
 	<field name="naaccrPovertyIndicator" start="158" end="158" long-label="NAACCR poverty indicator"/>
 	<field name="cdcSubcounty5k" start="159" end="169" long-label="CDC Subcounty 5k Geography"/>
 	<field name="cdcSubcounty20k" start="170" end="180" long-label="CDC Subcounty 20k Geography"/>
diff --git a/src/test/resources/tract/time-dependent-tract-data-layout-2025.xml b/src/test/resources/tract/time-dependent-tract-data-layout-2025.xml
index f433f1c..7eb868d 100644
--- a/src/test/resources/tract/time-dependent-tract-data-layout-2025.xml
+++ b/src/test/resources/tract/time-dependent-tract-data-layout-2025.xml
@@ -34,12 +34,12 @@
 	<field name="uric2020C" start="136" end="136" long-label="2010 Census-based Urban Rural Indicator Codes (URIC) categorization C"/>
 	<field name="woodsAndPoole2019" start="137" end="146" long-label="Woods and Poole Tract Population Vintage 2019"/>
 	<field name="zoneId" start="147" end="156" long-label="Zone ID"/>
-	<field name="zoneTractCertainty" start="157" end="157" long-label="Zone Tract Certainty"/>
+	<field name="zoneTractRequired" start="157" end="157" long-label="Zone Tract Required"/>
 	<field name="naaccrPovertyIndicator" start="158" end="158" long-label="NAACCR poverty indicator"/>
 	<field name="cdcSubcounty5k" start="159" end="169" long-label="CDC Subcounty 5k Geography"/>
 	<field name="cdcSubcounty20k" start="170" end="180" long-label="CDC Subcounty 20k Geography"/>
 	<field name="cdcSubcounty50k" start="181" end="191" long-label="CDC Subcounty 50k Geography"/>
-	<field name="persistentPovertye2022" start="192" end="192" long-label="Persistent Poverty"/>
+	<field name="persistentPoverty" start="192" end="192" long-label="Persistent Poverty"/>
 	<field name="sviSocioEconStatusUse2022" start="193" end="197" long-label="SVI - Socioeconomic Status - US Based"/>
 	<field name="sviHouseCompAndDisabUse2022" start="198" end="202" long-label="SVI - Household Composition and Disability - US Based"/>
 	<field name="sviMinorotyStatusAndLangUse2022" start="203" end="207" long-label="SVI - Minority Status and Language - US Based"/>
diff --git a/src/test/resources/tract/time-dependent-tract-data-layout-2026.xml b/src/test/resources/tract/time-dependent-tract-data-layout-2026.xml
new file mode 100644
index 0000000..afa41dc
--- /dev/null
+++ b/src/test/resources/tract/time-dependent-tract-data-layout-2026.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<fixed-column-layout id="time-dependent-tract-data-layout-2026" name="Time-dependent Tract Data Layout 2026" length="268">
+    <field name="stateFipsCode" start="1" end="2" long-label="State FIPS code"/>
+	<field name="countyFipsCode" start="3" end="5" long-label="County FIPS code"/>
+	<field name="tract" start="6" end="11" long-label="Tract"/> <!-- 2020 tract -->
+	<field name="year" start="12" end="15" long-label="Year"/>
+	<field name="reserved" start="16" end="29" long-label="Reserved for future use"/>
+	<field name="medianHousholdIncome" start="30" end="34" long-label="Median household income (in tens)"/>
+	<field name="medianGrossRent" start="35" end="39" long-label="Median gross rent"/>
+	<field name="medianHouseValue" start="40" end="44" long-label="Median home value (in hundreds)"/>
+	<field name="percLessHighSchoolEduc" start="45" end="49" long-label="Percent of persons with less than high school education"/>
+	<field name="percWithHighSchoolEduc" start="50" end="54" long-label="Percent of persons with high school only education"/>
+	<field name="percMoreHighSchoolEduc" start="55" end="59" long-label="Percent of persons with more than high school education"/>
+	<field name="educationIndex" start="60" end="64" long-label="Education index"/>
+	<field name="percentBelow150PercentPoverty" start="65" end="69" long-label="Percent of persons below 150% poverty"/>
+	<field name="percentUnemployed" start="70" end="74" long-label="Percent unemployed"/>
+	<field name="percentWorkingClass" start="75" end="79" long-label="Percent working class"/>
+	<field name="yostUsBasedIndex" start="80" end="84" long-label="Yost - U.S.-based index"/>
+	<field name="yostStateBasedIndex" start="85" end="89" long-label="Yost - State-based index"/>
+	<field name="yostUsBasedQuintile" start="90" end="90" long-label="Yost - U.S.-based quintile"/>
+	<field name="yostStateBasedQuintile" start="91" end="91" long-label="Yost - State-based quintile"/>
+	<field name="percentBelowPovertyAllRaces" start="92" end="96" long-label="Percent of persons below poverty All races"/>
+	<field name="percentBelowPovertyWhite" start="97" end="101" long-label="Percent of persons below poverty White alone"/>
+	<field name="percentBelowPovertyBlack" start="102" end="106" long-label="Percent of persons below poverty Black or African American alone"/>
+	<field name="percentBelowPovertyAmIndian" start="107" end="111" long-label="Percent of persons below poverty American Indian and Alaska Native alone"/>
+	<field name="percentBelowPovertyAsian" start="112" end="116" long-label="Percent of persons below poverty Asian alone + Native Hawaiian and Other Pacific Islander alone"/>
+	<field name="percentBelowPovertyOtherMult" start="117" end="121" long-label="Percent of persons below poverty Some other race alone + two or more races"/>
+	<field name="percentBelowPovertyWhiteNotHisp" start="122" end="126" long-label="Percent of persons below poverty White alone, not Hispanic or Latino"/>
+	<field name="percentBelowPovertyHisp" start="127" end="131" long-label="Percent of persons below poverty Hispanic or Latino"/>
+	<field name="ruca2020A" start="132" end="132" long-label="2010 RUCA-based categorization A"/>
+	<field name="ruca2020C" start="133" end="133" long-label="2010 RUCA-based categorization C"/>
+	<field name="uric2020A" start="134" end="134" long-label="2010 Census-based Urban Rural Indicator Codes (URIC) categorization A"/>
+	<field name="uric2020B" start="135" end="135" long-label="2010 Census-based Urban Rural Indicator Codes (URIC) categorization B"/>
+	<field name="uric2020C" start="136" end="136" long-label="2010 Census-based Urban Rural Indicator Codes (URIC) categorization C"/>
+	<field name="woodsAndPoole2019" start="137" end="146" long-label="Woods and Poole Tract Population Vintage 2019"/>
+    <!-- old cancer reporting zone fields are now blank, they have been split into two sets added at the end of the file -->
+    <!-- <field name="zoneId" start="147" end="156" long-label="Zone ID"> -->
+	<!-- <field name="zoneTractRequired" start="157" end="157" long-label="Zone Tract Required"/> -->
+	<field name="naaccrPovertyIndicator" start="158" end="158" long-label="NAACCR poverty indicator"/>
+	<field name="cdcSubcounty5k" start="159" end="169" long-label="CDC Subcounty 5k Geography"/>
+	<field name="cdcSubcounty20k" start="170" end="180" long-label="CDC Subcounty 20k Geography"/>
+	<field name="cdcSubcounty50k" start="181" end="191" long-label="CDC Subcounty 50k Geography"/>
+	<field name="persistentPoverty" start="192" end="192" long-label="Persistent Poverty"/>
+	<field name="sviSocioEconStatusUse2022" start="193" end="197" long-label="SVI - Socioeconomic Status - US Based"/>
+	<field name="sviHouseCompAndDisabUse2022" start="198" end="202" long-label="SVI - Household Composition and Disability - US Based"/>
+	<field name="sviMinorotyStatusAndLangUse2022" start="203" end="207" long-label="SVI - Minority Status and Language - US Based"/>
+	<field name="sviHousingTypeAndTranspUse2022" start="208" end="212" long-label="SVI - Housing Type and Transportation - US Based"/>
+	<field name="sviOverallUse2022" start="213" end="217" long-label="SVI Overall - US Based"/>
+	<field name="sviSocioEconStatusStatee2022" start="218" end="222" long-label="SVI - Socioeconomic Status - State Based"/>
+	<field name="sviHouseCompAndDisabStatee2022" start="223" end="227" long-label="SVI - Household Composition and Disability - State Based"/>
+	<field name="sviMinorotyStatusAndLangStatee2022" start="228" end="232" long-label="SVI - Minority Status and Language - State Based"/>
+	<field name="sviHousingTypeAndTranspStatee2022" start="233" end="237" long-label="SVI - Housing Type and Transportation - State Based"/>
+	<field name="sviOverallState2022" start="238" end="242" long-label="SVI Overall - State Based"/>
+	<field name="congressionalDistrict119" start="243" end="246" long-label="Congressional District"/>
+	<field name="zoneId2010" start="247" end="256" long-label="Zone ID 2010"/>
+	<field name="zoneTractRequired2010" start="257" end="257" long-label="Zone Tract Required 2010"/>
+	<field name="zoneId2020" start="258" end="267" long-label="Zone ID 2020"/>
+	<field name="zoneTractRequired2020" start="268" end="268" long-label="Zone Tract Required 2020"/>
+</fixed-column-layout>
\ No newline at end of file