diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7610d340..034d6946 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 **Changes in version 5.6**
 
 - Added NAACCR 25 XML layout; documentation is not available yet for new data items.
+- 
 - Updated NAACCR XML library from version 10.1 to version 11.0.
 - Updated CSV library from version 5.8 to version 5.9.
 
diff --git a/docs/naaccr-lookups/lookups/addrAtDxCountry.csv b/docs/naaccr-lookups/lookups/addrAtDxCountry.csv
index a7099c81..238d0999 100644
--- a/docs/naaccr-lookups/lookups/addrAtDxCountry.csv
+++ b/docs/naaccr-lookups/lookups/addrAtDxCountry.csv
@@ -213,7 +213,7 @@ SUR,Suriname
 SVK,Slovakia
 SVN,Slovenia
 SWE,Sweden
-SWZ,Swaziland
+SWZ,Eswatini (formerly Swaziland)
 SXM,Sint Maarten (Dutch part)
 SYC,Seychelles
 SYR,Syrian Arab Republic
diff --git a/docs/naaccr-lookups/lookups/addrCurrentCountry.csv b/docs/naaccr-lookups/lookups/addrCurrentCountry.csv
index a7099c81..238d0999 100644
--- a/docs/naaccr-lookups/lookups/addrCurrentCountry.csv
+++ b/docs/naaccr-lookups/lookups/addrCurrentCountry.csv
@@ -213,7 +213,7 @@ SUR,Suriname
 SVK,Slovakia
 SVN,Slovenia
 SWE,Sweden
-SWZ,Swaziland
+SWZ,Eswatini (formerly Swaziland)
 SXM,Sint Maarten (Dutch part)
 SYC,Seychelles
 SYR,Syrian Arab Republic
diff --git a/docs/naaccr-lookups/lookups/ajccId.csv b/docs/naaccr-lookups/lookups/ajccId.csv
index 6b766d6f..8c349085 100644
--- a/docs/naaccr-lookups/lookups/ajccId.csv
+++ b/docs/naaccr-lookups/lookups/ajccId.csv
@@ -109,4 +109,16 @@
 83.3,Leukemia: Acute Lymphocytic Leukemia in Adults
 83.4,Leukemia: Chronic Myeloid Leukemia
 9,Nasopharynx
+9001,Cervix Uteri (V9)
+9002,Appendix (V9)
+9003,Anus (V9)
+9004,Brain and Spinal Cord Other (V9)
+9005,Brain and Spinal Cord Medulloblastoma (V9)
+9006,Vulva (V9)
+9007,Neuroendocrine Tumors of the Stomach (V9)
+9008,Neuroendocrine Tumors of the Duodenum and Ampulla of Vater (V9)
+9009,Neuroendocrine Tumors of the Jejunum and Ileum (V9)
+9010,Neuroendocrine Tumors of the Appendix (V9)
+9011,Neuroendocrine Tumors of the Colon and Rectum (V9)
+9012,Neuroendocrine Tumors of the Pancreas (V9)
 XX,No AJCC Chapter
diff --git a/docs/naaccr-lookups/lookups/birthplace.csv b/docs/naaccr-lookups/lookups/birthplace.csv
index 93cc1324..9807401e 100644
--- a/docs/naaccr-lookups/lookups/birthplace.csv
+++ b/docs/naaccr-lookups/lookups/birthplace.csv
@@ -252,6 +252,141 @@
 723,Micronesian Islands (Historic)
 725,Polynesian Islands (Historic)
 750,Antarctica
+800,Aruba
+801,Anguilla
+802,Aland Islands
+803,Andorra
+804,United Arab Emirates (the)
+805,Armenia
+806,French Southern Territories (the)
+807,Antigua and Barbuda
+808,Azerbaijan
+809,Benin
+810,"Bonaire, Saint Eustatius and Saba"
+811,Burkina Faso
+812,Bahrain
+813,Bosnia and Herzogovina
+814,Saint Barthélemy
+815,Barbados
+816,Brunei Darussalam
+817,Bhutan
+818,Bouvet Island
+819,Botswana
+820,Central African Republic (the)
+821,Alberta
+822,Manitoba
+823,New Brunswick
+824,Newfoundland and Labrador
+825,Nova Scotia
+826,Northwest Territories
+827,Prince Edward Island
+828,Saskatchewan
+829,Yukon
+830,Cocos (Keeling) Islands (the)
+831,Côte d'Ivoire
+832,Cameroon
+833,Congo (the)
+834,Comoros (the)
+835,Cabo Verde (formerly Cape Verde)
+836,Curacao
+837,Christmas Island
+838,Cayman Islands (the)
+839,Czechia (formerly Czech Republic)
+840,Dominica
+841,England
+842,Eritrea
+843,Western Sahara
+844,Ethiopia
+845,Fiji
+846,Faroe Islands (the)
+847,Gabon
+848,Georgia
+849,Guernsey
+850,Ghana
+851,Guinea
+852,Guadeloupe
+853,Gambia (the)
+854,Guinea Bissau
+855,Equatorial Guinea
+856,Grenada
+857,Heard Island and McDonald Islands
+858,Croatia
+859,Isle of Man
+860,British Indian Ocean Territory (the)
+861,Israel
+862,Jersey
+863,Kazakhstan
+864,Kyrgyzstan
+865,Saint Kitts and Nevis
+866,Kuwait
+867,Liberia
+868,Saint Lucia
+869,Lesotho
+870,Saint-Martin (French part)
+871,Monaco
+872,Moldova (the Republic of)
+873,North Macedonia
+874,Mali
+875,Montenegro
+876,Mauritania
+877,Montserrat
+878,Martinique
+879,Mauritius
+880,Malaysia
+881,Mayotte
+882,Namibia
+883,New Caledonia
+884,Niger
+885,Norfolk Island
+886,Niue
+887,Nauru
+888,Oman
+889,Pitcairn Islands
+890,Papua New Guinea
+891,Korea (the Democratic People's Republic of) (used for North Korea)
+892,"Palestine, State of"
+893,French Polynesia
+894,Qatar
+895,Réunion
+896,Saudi Arabia
+897,Sudan
+898,Senegal
+899,Singapore
+900,South Georgia and the South Sandwich Islands
+901,"Saint Helena, Ascension and Tristan da Cunha"
+902,Svalbard and Jan Mayen
+903,Solomon Islands
+904,Sierra Leone
+905,San Marino
+906,Serbia
+907,South Sudan
+908,Sao Tome and Principe
+909,Slovakia
+910,Slovenia
+911,Eswatini (formerly Swaziland)
+912,Sint Maarten (Dutch part)
+913,Seychelles
+914,Turks and Caicos Islands (the)
+915,Chad
+916,Togo
+917,Tajikistan
+918,Turkmenistan
+919,Timor-Leste
+920,Tonga
+921,Trinidad and Tobago
+922,Ukraine
+923,Armed Forces Americas (except Canada)
+924,"Armed Forces Europe, the Middle East, and Canada"
+925,Armed Forces Pacific
+926,Uzbekistan
+927,Holy See (the) (Vatican City)
+928,Saint Vincent and the Grenadines
+929,Virgin Islands (British)
+930,Vanuatu
+931,Wallis and Futuna
+932,Samoa
+933,Yemen
+934,South Africa
 997,"Not applicable, patient alive-Place of Death only"
 998,"Not United States, NOS"
 999,Unknown
diff --git a/docs/naaccr-lookups/lookups/birthplaceCountry.csv b/docs/naaccr-lookups/lookups/birthplaceCountry.csv
index a7099c81..238d0999 100644
--- a/docs/naaccr-lookups/lookups/birthplaceCountry.csv
+++ b/docs/naaccr-lookups/lookups/birthplaceCountry.csv
@@ -213,7 +213,7 @@ SUR,Suriname
 SVK,Slovakia
 SVN,Slovenia
 SWE,Sweden
-SWZ,Swaziland
+SWZ,Eswatini (formerly Swaziland)
 SXM,Sint Maarten (Dutch part)
 SYC,Seychelles
 SYR,Syrian Arab Republic
diff --git a/docs/naaccr-lookups/lookups/followupContactCountry.csv b/docs/naaccr-lookups/lookups/followupContactCountry.csv
index a7099c81..238d0999 100644
--- a/docs/naaccr-lookups/lookups/followupContactCountry.csv
+++ b/docs/naaccr-lookups/lookups/followupContactCountry.csv
@@ -213,7 +213,7 @@ SUR,Suriname
 SVK,Slovakia
 SVN,Slovenia
 SWE,Sweden
-SWZ,Swaziland
+SWZ,Eswatini (formerly Swaziland)
 SXM,Sint Maarten (Dutch part)
 SYC,Seychelles
 SYR,Syrian Arab Republic
diff --git a/docs/naaccr-lookups/lookups/geocodingQualityCode.csv b/docs/naaccr-lookups/lookups/geocodingQualityCode.csv
new file mode 100644
index 00000000..69796e1d
--- /dev/null
+++ b/docs/naaccr-lookups/lookups/geocodingQualityCode.csv
@@ -0,0 +1,4 @@
+F,Fail/non-match. Geocoding was completed and the address needs to be manually reviewed and modified and geocoded again.
+I,Interactive. Geocoding was completed and the address matched after manual review in MI GeoCorrect Tool.
+M,Match. Geocoding was completed and the address matched.
+R,Review. Geocoding was completed and the address needs to be manually reviewed before using below county-level.
diff --git a/docs/naaccr-lookups/lookups/histologicTypeIcdO3_allTerms.csv b/docs/naaccr-lookups/lookups/histologicTypeIcdO3_allTerms.csv
index c0be958f..69927db3 100644
--- a/docs/naaccr-lookups/lookups/histologicTypeIcdO3_allTerms.csv
+++ b/docs/naaccr-lookups/lookups/histologicTypeIcdO3_allTerms.csv
@@ -106,8 +106,12 @@
 8020,3,"Carcinoma, dedifferentiated [2021+]",alternate
 8020,3,"Carcinoma, poorly differentiated, NOS [2021+]",alternate
 8020,3,Dedifferentiated carcinoma [2021+],alternate
+8020,3,"Carcinoma, poorly differentiated urothelial [2024+]",alternate
 8020,3,"Poorly differentiated carcinoma, NOS [2021+]",alternate
+8020,3,"Carcinoma, urothelial, poorly differentiated [2024+]",alternate
 8020,3,"Undifferentiated carcinoma, NOS",alternate
+8020,3,Poorly differentiated urothelial carcinoma [2024+],alternate
+8020,3,"Urothelial carcinoma, poorly differentiated [2024+]",alternate
 8021,3,"Carcinoma, anaplastic, NOS",preferred
 8021,3,"Anaplastic carcinoma, NOS",alternate
 8022,2,Pleomorphic carcinoma in situ,preferred
@@ -292,6 +296,9 @@
 8070,3,"Epithelioma, squamous cell",alternate
 8070,3,Squamous carcinoma,alternate
 8070,3,Squamous cell epithelioma,alternate
+8070,3,"Carcinoma, pure squamous, of urothelial tract [2024+]",alternate
+8070,3,Pure squamous carcinoma of urothelial tract [2024+],alternate
+8070,3,"Squamous carcinoma, pure, of urothelial tract [2024+]",alternate
 8070,3,"Carcinoma, epidermoid, NOS",alternate
 8070,3,"Carcinoma, squamous",alternate
 8070,3,"Carcinoma, squamous cell, NOS",alternate
@@ -462,16 +469,16 @@
 8084,3,"Carcinoma, squamous cell, clear cell type",alternate
 8084,3,Clear cell type squamous cell carcinoma,alternate
 8085,3,"Squamous cell carcinoma, HPV-positive (C01.9, C09.9, C10.2, C10.3, C10.8, C10.9, C31.0-C31.3, C31.9)",preferred
-8085,3,"Carcinoma, squamous cell, HPV-associated (C53._) [2021+]",alternate
-8085,3,HPV-associated squamous cell carcinoma (C53._) [2021+],alternate
-8085,3,"Squamous cell carcinoma, HPV-associated (C53._) [2021+]",alternate
+8085,3,"Carcinoma, squamous cell, HPV-associated (C53._) [2021+] (C60._, C63.2) [2024+]",alternate
+8085,3,"HPV-associated squamous cell carcinoma (C53._) [2021+] (C60._, C63.2) [2024+]",alternate
+8085,3,"Squamous cell carcinoma, HPV-associated (C53._) [2021+] (C60._, C63.2) [2024+]",alternate
 8085,3,"Carcinoma, squamous cell, HPV-positive (C01.9, C09.9, C10.2, C10.3, C10.8, C10.9, C31.0–C31.3, C31.9) [2018+]",alternate
 8085,3,"HPV-positive squamous cell carcinoma (C01.9, C09.9, C10.2, C10.3, C10.8, C10.9, C31.0–C31.3, C31.9) [2018+]",alternate
 8086,3,"Squamous cell carcinoma, HPV-negative (C01.9, C09.9, C10.2, C10.3, C10.8, C10.9, C31.0-C31.3, C31.9)",preferred
-8086,3,"Carcinoma, squamous cell, HPV-independent (C53._) [2021+]",alternate
-8086,3,HPV-independent squamous cell carcinoma (C53._) [2021+],alternate
+8086,3,"Carcinoma, squamous cell, HPV-independent (C53._) [2021+] (C60._, C63.2) [2024+]",alternate
+8086,3,"HPV-independent squamous cell carcinoma (C53._) [2021+] (C60._, C63.2) [2024+]",alternate
 8086,3,"Carcinoma, squamous cell, HPV-negative (C01.9, C09.9, C10.2, C10.3, C10.8, C10.9, C31.0–C31.3, C31.9) [2018+]",alternate
-8086,3,"Squamous cell carcinoma, HPV-independent (C53._) [2021+]",alternate
+8086,3,"Squamous cell carcinoma, HPV-independent (C53._) [2021+] (C60._, C63.2) [2024+]",alternate
 8086,3,"HPV-negative squamous cell carcinoma (C01.9, C09.9, C10.2, C10.3, C10.8, C10.9, C31.0–C31.3, C31.9) [2018+]",alternate
 8090,1,Basal cell tumor (C44._),preferred
 8090,1,"Tumor, basal cell (C44._)",alternate
@@ -630,17 +637,29 @@
 8120,3,"Carcinoma, urothelial, NOS",alternate
 8120,3,"Clear cell (glycogen-rich) urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2018+]",alternate
 8120,3,"Lipid-rich urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2018+]",alternate
+8120,3,"Carcinoma, urothelial, conventional (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Microcystic urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2018+]",alternate
+8120,3,"Carcinoma, urothelial, large nested (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Nested urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2018+]",alternate
+8120,3,"Carcinoma, urothelial, microcystic AND tubular (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,Squamotransitional carcinoma [2018+],alternate
+8120,3,"Carcinoma, urothelial, tubular AND microcystic (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,Squamotransitional cell carcinoma (C53._) [2018+],alternate
+8120,3,"Conventional urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,Transitional carcinoma,alternate
+8120,3,"Large nested urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma with divergent differentiation (C65.9, C66.9, C67._, C68._)",alternate
+8120,3,"Microcystic AND tubular urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma with squamous differentiation (C65.9, C66.9, C67._, C68._)",alternate
+8120,3,"Tubular AND microcystic urothelial carcinoma (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma with trophoblastic differentiation (C65.9, C66.9, C67._, C68._)",alternate
+8120,3,"Urothelial carcinoma, conventional (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma, clear cell (glycogen-rich) (C65.9, C66.9, C67._, C68._) [2018+]",alternate
+8120,3,"Urothelial carcinoma, large nested (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma, lipid-rich (C65.9, C66.9, C67._, C68._) [2018+]",alternate
+8120,3,"Urothelial carcinoma, microcystic AND tubular (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma, microcystic (C65.9, C66.9, C67._, C68._) [2018+]",alternate
+8120,3,"Urothelial carcinoma, tubular AND microcystic (C65.9, C66.9, C67._, C68._) [2024+]",alternate
 8120,3,"Urothelial carcinoma, nested (C65.9, C66.9, C67._, C68._) [2018+]",alternate
 8120,3,"Urothelial carcinoma, NOS",alternate
 8121,0,"Schneiderian papilloma, NOS (C30.0, C31._)",preferred
@@ -678,17 +697,20 @@
 8121,3,"Carcinoma, Schneiderian (C30.0, C31._)",alternate
 8121,3,"Cylindrical cell carcinoma (C30.0, C31._)",alternate
 8122,3,"Transitional cell carcinoma, spindle cell",preferred
-8122,3,"Transitional cell carcinoma, sarcomatoid",alternate
-8122,3,"Transitional cell carcinoma, spindle cell",alternate
-8122,3,"Urothelial carcinoma, spindle cell",alternate
 8122,3,"Carcinoma, transitional cell, sarcomatoid",alternate
+8122,3,"Carcinoma, urothelial, plasmacytoid [2024+]",alternate
 8122,3,"Carcinoma, transitional cell, spindle cell",alternate
+8122,3,Plasmacytoid urothelial carcinoma [2024+],alternate
 8122,3,"Carcinoma, urothelial, sarcomatoid",alternate
+8122,3,"Urothelial carcinoma, plasmacytoid [2024+]",alternate
 8122,3,"Carcinoma, urothelial, spindle cell",alternate
 8122,3,Sarcomatoid transitional cell carcinoma,alternate
 8122,3,Sarcomatoid urothelial carcinoma,alternate
 8122,3,Spindle cell transitional cell carcinoma,alternate
 8122,3,Spindle cell urothelial cell carcinoma,alternate
+8122,3,"Transitional cell carcinoma, sarcomatoid",alternate
+8122,3,"Transitional cell carcinoma, spindle cell",alternate
+8122,3,"Urothelial carcinoma, spindle cell",alternate
 8123,2,"Basaloid carcinoma, in situ (C21.1)",preferred
 8123,3,Basaloid carcinoma (C21.1),preferred
 8123,3,"Carcinoma, basaloid",alternate
@@ -704,6 +726,16 @@
 8130,1,"Transitional cell neoplasm, papillary, low malignant potential (C67._)",alternate
 8130,1,"Urothelial neoplasm, papillary, of low malignant potential (C67._)",alternate
 8130,2,"Papillary transitional cell carcinoma, non-invasive (C65.9, C66.9, C67._)",preferred
+8130,2,"Papillary carcinoma, urothelial, non-invasive, high-grade (C67._) [2024+]",alternate
+8130,2,"Papillary carcinoma, urothelial, non-invasive, low-grade (C67._) [2024+]",alternate
+8130,2,"Papillary urothelial carcinoma, low-grade, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Papillary urothelial carcinoma, non-invasive, high-grade (C67._) [2024+]",alternate
+8130,2,"Papillary urothelial carcinoma, non-invasive, high-grade, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Papillary urothelial carcinoma, non-invasive, low-grade (C67._) [2024+]",alternate
+8130,2,"Carcinoma, non-invasive, papillary transitional cell (C67._)",alternate
+8130,2,"Carcinoma, non-invasive, papillary urothelial (C67._)",alternate
+8130,2,"Carcinoma, papillary transitional cell, non-invasive (C67._)",alternate
+8130,2,"Carcinoma, papillary urothelial, non-invasive (C67._)",alternate
 8130,2,"Carcinoma, transitional cell, papillary, non-invasive (C67._)",alternate
 8130,2,"Carcinoma, urothelial, non-invasive, papillary (C67._)",alternate
 8130,2,"Carcinoma, urothelial, papillary, non-invasive (C67._)",alternate
@@ -713,10 +745,27 @@
 8130,2,"Papillary urothelial carcinoma, non-invasive (C67._)",alternate
 8130,2,"Transitional cell carcinoma, papillary, non-invasive (C67._)",alternate
 8130,2,"Urothelial carcinoma, papillary, non-invasive (C67._)",alternate
-8130,2,"Carcinoma, non-invasive, papillary transitional cell (C67._)",alternate
-8130,2,"Carcinoma, non-invasive, papillary urothelial (C67._)",alternate
-8130,2,"Carcinoma, papillary transitional cell, non-invasive (C67._)",alternate
-8130,2,"Carcinoma, papillary urothelial, non-invasive (C67._)",alternate
+8130,2,"Carcinoma, non-invasive, papillary urothelial, high-grade (C67._) [2024+]",alternate
+8130,2,"Carcinoma, non-invasive, papillary urothelial, low-grade (C67._) [2024+]",alternate
+8130,2,"Carcinoma, papillary urothelial, low-grade, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Carcinoma, papillary urothelial, non-invasive, high-grade (C67._) [2024+]",alternate
+8130,2,"Carcinoma, papillary urothelial, non-invasive, high-grade, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Carcinoma, papillary urothelial, non-invasive, low-grade (C67._) [2024+]",alternate
+8130,2,"Carcinoma, urothelial, papillary, low-grade, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Carcinoma, urothelial, papillary, non-invasive, high-grade (C67._) [2024+]",alternate
+8130,2,"Carcinoma, urothelial, papillary, non-invasive, high-grade, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Carcinoma, urothelial, papillary, non-invasive, low-grade (C67._) [2024+]",alternate
+8130,2,High-grade non-invasive papillary urothelial carcinoma (C67._) [2024+],alternate
+8130,2,"High-grade papillary urothelial carcinoma, non-invasive (C67._) [2024+]",alternate
+8130,2,"High-grade papillary urothelial carcinoma, non-invasive, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,Low-grade non-invasive papillary urothelial carcinoma (C67._) [2024+],alternate
+8130,2,Low-grade papillary urothelial carcinoma with an inverted growth pattern (C67._) [2024+],alternate
+8130,2,"Low-grade papillary urothelial carcinoma, non-invasive (C67._) [2024+]",alternate
+8130,2,Non-invasive high-grade papillary urothelial carcinoma with an inverted growth pattern (C67._) [2024+],alternate
+8130,2,"Non-invasive papillary urothelial carcinoma, high-grade (C67._) [2024+]",alternate
+8130,2,"Non-invasive papillary urothelial carcinoma, low-grade (C67._) [2024+]",alternate
+8130,2,"Papillary carcinoma, urothelial, high-grade, non-invasive, with an inverted growth pattern (C67._) [2024+]",alternate
+8130,2,"Papillary carcinoma, urothelial, low-grade with an inverted growth pattern (C67._) [2024+]",alternate
 8130,3,Papillary transitional cell carcinoma,preferred
 8130,3,"Urothelial carcinoma, papillary (C67._)",alternate
 8130,3,"Carcinoma, papillary transitional cell (C67._)",alternate
@@ -753,7 +802,9 @@
 8140,3,Parathyroid tumor (C75.0) [REPORTABLE 2021+],alternate
 8140,3,"Tumor, endolymphatic sac [REPORTABLE 2021+]",alternate
 8140,3,"Tumor, parathyroid (C75.0) [REPORTABLE 2021+]",alternate
+8140,3,"Carcinoma, prostatic intraepithelial-like (C61.9) [2024+]",alternate
 8140,3,Usual type adenocarcinoma,alternate
+8140,3,Prostatic intraepithelial-like carcinoma (C61.9) [2024+],alternate
 8140,3,Acinar adenocarcinoma (C61.9 ONLY) [DO NOT USE 8550/3 OR 8551/3 FOR PROSTATE] [2018+],alternate
 8140,3,"Adenocarcinoma, acinar (C61.9 ONLY) [DO NOT USE 8550/3 OR 8551/3 FOR PROSTATE] [2018+]",alternate
 8140,3,"Adenocarcinoma, endocervical, usual type (C53._) [2018+]",alternate
@@ -802,6 +853,8 @@
 8147,0,"Adenoma, basal cell",alternate
 8147,3,"Basal cell adenocarcinoma (C07._, C08._)",preferred
 8147,3,"Adenocarcinoma, basal cell",alternate
+8147,3,Adenoid cystic (basal cell) carcinoma (C61.9) [2024+],alternate
+8147,3,"Carcinoma, adenoid cystic (basal cell) (C61.9) [2024+]",alternate
 8148,2,"Glandular intraepithelial neoplasia, grade III",preferred
 8148,2,Grade III glandular intraepithelial neoplasia,alternate
 8148,2,"Intraepithelial neoplasia, grade III, glandular",alternate
@@ -1370,6 +1423,8 @@
 8257,3,"Adenocarcinoma, minimally invasive, mucinous (C34._) [2018+]",alternate
 8257,3,"Mucinous adenocarcinoma, minimally invasive (C34._) [2018+]",alternate
 8260,0,"Papillary adenoma, NOS",preferred
+8260,0,"Adenoma, tubulopapillary [2024+; NOT REPORTABLE; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY.]",alternate
+8260,0,Tubulopapillary adenoma [2024+; NOT REPORTABLE; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY.],alternate
 8260,0,"Adenoma, papillary, NOS",alternate
 8260,0,Glandular papilloma,alternate
 8260,0,"Papilloma, glandular",alternate
@@ -1546,6 +1601,30 @@
 8311,3,MiT family translocation renal cell carcinoma (C64.9) [2018+],alternate
 8311,3,"Renal cell carcinoma, associated with hereditary leiomyomatosis (C64.9) [2018+]",alternate
 8311,3,"Renal cell carcinoma, MiT family translocation (C64.9) [2018+]",alternate
+8311,3,ALK-rearranged RCC (C64.9) [2024+],alternate
+8311,3,"Carcinoma, renal cell, ALK-rearranged RCC (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, eosinophilic solid AND cystic (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, fumarate hydratase-deficient (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, mutated, ELOC (formerly TCEB1) (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, t(6;11) (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, TFE3-rearranged (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, TFEB-altered (C64.9) [2024+]",alternate
+8311,3,"Carcinoma, renal cell, Xp11 translocation (C64.9) [2024+]",alternate
+8311,3,ELOC (formerly TCEB1) mutated RCC (C64.9) [2024+],alternate
+8311,3,Eosinophilic solid AND cystic RCC (C64.9) [2024+],alternate
+8311,3,Fumarate hydratase-deficient RCC (C64.9) [2024+],alternate
+8311,3,"Renal cell carcinoma, ALK-rearranged (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, eosinophilic solid AND cystic (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, fumarate hydratase-deficient (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, mutated, ELOC (formerly TCEB1) (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, t(6;11) (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, TFE3-rearranged (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, TFEB-altered (C64.9) [2024+]",alternate
+8311,3,"Renal cell carcinoma, Xp11 translocation (C64.9) [2024+]",alternate
+8311,3,t(6;11) RCC (C64.9) [2024+],alternate
+8311,3,TFE3-rearranged RCC (C64.9) [2024+],alternate
+8311,3,TFEB-altered RCC (C64.9) [2024+],alternate
+8311,3,Xp11 translocation RCC (C64.9) [2024+],alternate
 8312,2,Renal cell carcinoma in situ (C64.9),preferred
 8312,3,Renal cell carcinoma (C64.9),preferred
 8312,3,"Adenocarcinoma, renal cell (C64.9)",alternate
@@ -1834,6 +1913,9 @@
 8361,0,Juxtaglomerular tumor (C64._),preferred
 8361,0,Reninoma (C64.9),alternate
 8361,0,"Tumor, juxtaglomerular (C64.9)",alternate
+8361,1,Non-functioning juxtaglomerular cell tumor [2024+; NOT REPORTABLE],preferred
+8361,1,"Juxtaglomerular cell tumor, non-functioning [2024+; NOT REPORTABLE]",alternate
+8361,1,"Tumor, juxtaglomerular cell, non-functioning [2024+; NOT REPORTABLE]",alternate
 8370,0,"Adrenal cortical adenoma, NOS (C74.0)",preferred
 8370,0,"Adenoma, adrenal cortical, NOS (C74.0)",alternate
 8370,0,"Adrenal cortical tumor, benign (C74.0)",alternate
@@ -2667,14 +2749,20 @@
 8509,3,"Sweat gland carcinoma, endocrine mucin-producing (C44. _)",alternate
 8510,2,"Medullary carcinoma in situ, NOS (C73.9)",preferred
 8510,3,"Medullary carcinoma, NOS (C73.9)",preferred
-8510,3,Renal medullary carcinoma (C64.9),alternate
+8510,3,"Renal cell carcinoma, SMARCB1-deficient dedifferentiated of other specific subtypes (C64.9) [2024+]",alternate
+8510,3,"Renal cell carcinoma, SMARCB1-deficient medullary-like (C64.9) [2024+]",alternate
+8510,3,"Renal cell carcinoma, SMARCB1-deficient undifferentiated, NOS (C64.9) [2024+]",alternate
 8510,3,"Adenocarcinoma, medullary",alternate
+8510,3,SMARCB1-deficient dedifferentiated RCC of other specific subtypes (C64.9) [2024+],alternate
 8510,3,"Carcinoma, medullary, NOS [DO NOT USE FOR THYROID 2018+, USE 8345/3.]",alternate
+8510,3,SMARCB1-deficient medullary-like RCC (C64.9) [2024+],alternate
 8510,3,"Carcinoma, medullary-like",alternate
+8510,3,"SMARCB1-deficient undifferentiated RCC, NOS (C64.9) [2024+]",alternate
 8510,3,"Carcinoma, renal medullary (C64.9)",alternate
 8510,3,Medullary adenocarcinoma,alternate
 8510,3,"Medullary carcinoma, renal (C64.9)",alternate
 8510,3,Medullary-like carcinoma,alternate
+8510,3,Renal medullary carcinoma (C64.9),alternate
 8512,2,Medullary carcinoma in situ with lymphoid stroma (C50._),preferred
 8512,3,Medullary carcinoma with lymphoid stroma (C50._),preferred
 8512,3,"Carcinoma, medullary with lymphoid stroma",alternate
@@ -3115,6 +3203,9 @@
 8589,3,"Thymic carcinoma, intrathyroid (C73.9) [2021+]",alternate
 8589,3,"Thymus-like differentiation, carcinoma showing",alternate
 8589,3,"Thymus-like element, carcinoma showing",alternate
+8590,0,Myoid gonadal stromal tumor [2024+; NOT REPORTABLE],preferred
+8590,0,"Stromal tumor, myoid gonadal [2024+; NOT REPORTABLE]",alternate
+8590,0,"Tumor, stromal, myoid gonadal [2024+; NOT REPORTABLE]",alternate
 8590,1,"Sex cord-gonadal stromal tumor, NOS (C56.9 [F], C62._[M])",preferred
 8590,1,"Sex cord tumor, NOS",alternate
 8590,1,"Sex cord-gonadal stromal tumor, NOS",alternate
@@ -3970,6 +4061,9 @@
 8859,3,"Liposarcoma, myxoid pleomorphic [2022+]",alternate
 8859,3,"Pleomorphic liposarcoma, myxoid [2022+]",alternate
 8860,0,Angiomyolipoma,preferred
+8860,0,Oncocytic angiomyolipoma [2024+; NOT REPORTABLE],alternate
+8860,0,Angiomyolipoma with epithelial cysts [2024+; NOT REPORTABLE],alternate
+8860,0,"Angiomyolipoma, oncocytic [2024+; NOT REPORTABLE]",alternate
 8860,3,Angiomyoliposarcoma (C49._),preferred
 8861,0,"Angiolipoma, NOS",preferred
 8862,0,Chondroid lipoma,preferred
@@ -4229,6 +4323,15 @@
 8959,3,"Nephroma, cystic, malignant (C64.9)",alternate
 8959,3,"Nephroma, cystic, multilocular, malignant (C64.9)",alternate
 8960,1,Mesoblastic nephroma (C64._),preferred
+8960,1,Cellular congenital mesoblastic nephroma (C64.9) [2024+; NOT REPORTABLE],alternate
+8960,1,Classic congenital mesoblastic nephroma (C64.9) [2024+; NOT REPORTABLE],alternate
+8960,1,"Mesoblastic nephroma, cellular congenital (C64.9) [2024+; NOT REPORTABLE]",alternate
+8960,1,"Mesoblastic nephroma, classic congenital (C64.9) [2024+; NOT REPORTABLE]",alternate
+8960,1,"Mesoblastic nephroma, mixed congenital (C64.9) [2024+; NOT REPORTABLE]",alternate
+8960,1,Mixed congenital mesoblastic nephroma (C64.9) [2024+; NOT REPORTABLE],alternate
+8960,1,"Nephroma, mesoblastic, cellular congenital (C64.9) [2024+; NOT REPORTABLE]",alternate
+8960,1,"Nephroma, mesoblastic, classic congenital (C64.9) [2024+; NOT REPORTABLE]",alternate
+8960,1,"Nephroma, mesoblastic, mixed congenital (C64.9) [2024+; NOT REPORTABLE]",alternate
 8960,1,"Nephroma, mesoblastic",alternate
 8960,3,"Nephroblastoma, NOS (C64._)",preferred
 8960,3,"Nephroma, NOS (C64.9)",alternate
@@ -4251,9 +4354,13 @@
 8966,0,Renomedullary fibroma (C64.9),alternate
 8966,0,"Tumor, renomedullary interstitial cell (C64.9)",alternate
 8967,0,Ossifying renal tumor (C64._),preferred
+8967,0,Ossifying renal tumor of infancy (C64.9) [2024+; NOT REPORTABLE],alternate
 8967,0,"Renal tumor, ossifying (C64.9)",alternate
+8967,0,"Renal tumor of infancy, ossifying (C64.9) [2024+; NOT REPORTABLE]",alternate
 8967,0,"Tumor, ossifying renal (C64.9)",alternate
+8967,0,"Tumor, ossifying renal, of infancy (C64.9) [2024+; NOT REPORTABLE]",alternate
 8967,0,"Tumor, renal, ossifying (C64.9)",alternate
+8967,0,"Tumor, renal, ossifying, of infancy (C64.9) [2024+; NOT REPORTABLE]",alternate
 8970,3,Hepatoblastoma (C22.0),preferred
 8970,3,"Hepatoblastoma, mixed epithelial-mesenchymal (C22.0)",alternate
 8970,3,"Hepatoma, embryonal (C22.0)",alternate
@@ -4457,13 +4564,19 @@
 9055,3,"Multicystic mesothelioma, malignant (C48._)",preferred
 9060,2,"Dysgerminoma, in situ (C56.9 [F], C62._[M])",preferred
 9060,3,"Dysgerminoma (C56.9 [F], C62._[M])",preferred
-9061,2,"Seminoma, in situ (C62._)",preferred
+9061,2,Intratubular seminoma (C62._) [2024+],preferred
+9061,2,"Trophoblast, intratubular (C62._) [2024+]",alternate
+9061,2,Intratubular trophoblast (C62._) [2024+],alternate
+9061,2,"Seminoma, intratubular (C62._) [2024+]",alternate
 9061,3,"Seminoma, NOS (C62._)",preferred
+9061,3,Seminoma with syncytiotrophoblastic cells (C62._) [2024+],alternate
 9062,3,"Seminoma, anaplastic (C62._)",preferred
 9062,3,Anaplastic seminoma (C62._),alternate
 9062,3,Seminoma with high mitotic index (C62._),alternate
 9063,2,"Spermatocytic seminoma, in situ (C62._)",preferred
 9063,3,Spermatocytic seminoma (C62._),preferred
+9063,3,Spermatocytic tumor with sarcomatous differentiation (C62._) [2024+],alternate
+9063,3,"Tumor with sarcomatous differentiation, spermatocytic (C62._) [2024+]",alternate
 9063,3,"Seminoma, spermatocytic (C62._)",alternate
 9063,3,Spermatocytoma (C62._),alternate
 9064,2,Intratubular malignant germ cells (C62._),preferred
@@ -4477,11 +4590,16 @@
 9065,3,"Germ cell tumor, nonseminomatous (C62._)",preferred
 9065,3,"Tumor, germ cell, nonseminomatous (C62._)",alternate
 9065,3,"Tumor, nonseminomatous germ cell (C62._)",alternate
-9070,2,"Embryonal carcinoma, NOS, in situ",preferred
+9070,2,Intratubular embryonal carcinoma [2024+],preferred
+9070,2,"Carcinoma, embryonal, intratubular [2024+]",alternate
+9070,2,"Embryonal carcinoma, intratubular [2024+]",alternate
 9070,3,"Embryonal carcinoma, NOS",preferred
 9070,3,"Adenocarcinoma, embryonal",alternate
 9070,3,"Carcinoma, embryonal, NOS",alternate
 9070,3,Embryonal adenocarcinoma,alternate
+9071,2,Intratubular yolk sac tumor [2024+],preferred
+9071,2,"Tumor, yolk sac, intratubular [2024+]",alternate
+9071,2,"Yolk sac tumor, intratubular [2024+]",alternate
 9071,3,"Yolk sac tumor (C56.9 [F], C62._[M])",preferred
 9071,3,"Tumor, yolk sac",alternate
 9071,3,"Tumor, yolk sac, hepatoid",alternate
@@ -4529,12 +4647,15 @@
 9080,1,"Teratoma, immature (C37.9) [2021+, NOT REPORTABLE]",alternate
 9080,1,"Teratoma, immature (C73.9) [2021+, NOT REPORTABLE]",alternate
 9080,1,"Teratoma, solid",alternate
-9080,2,"Teratoma, in situ",preferred
-9080,3,"Teratoma, malignant, NOS",preferred
+9080,2,Intratubular teratoma [2024+],preferred
+9080,2,"Teratoma, intratubular [2024+]",alternate
+9080,3,"Teratoma, postpubertal-type [2024+]",preferred
 9080,3,"Teratoblastoma, malignant",alternate
 9080,3,"Teratoma, embryonal",alternate
 9080,3,"Teratoma, immature, malignant",alternate
 9080,3,"Teratoma, immature, NOS [FOR 2021+, USE CODE 9080/1 FOR C34._, C37.9, C73.9]",alternate
+9080,3,"Teratoma, malignant, NOS",alternate
+9080,3,Postpubertal-type teratoma [2024+],alternate
 9080,3,Embryonal teratoma,alternate
 9080,3,"Immature teratoma, malignant",alternate
 9080,3,"Immature teratoma, NOS [FOR 2021+, USE CODE 9080/1 FOR C34._, C37.9, C73.9]",alternate
@@ -4578,6 +4699,12 @@
 9085,3,"Teratoma and seminoma, mixed",alternate
 9085,3,"Tumor, germ cell, mixed",alternate
 9085,3,"Tumor, mixed germ cell",alternate
+9085,3,Diffuse embryoma [2024+],alternate
+9085,3,"Embryoma, diffuse [2024+]",alternate
+9085,3,Mixed teratoma AND yolk sac tumor [2024+],alternate
+9085,3,"Teratoma, mixed AND yolk sac tumor [2024+]",alternate
+9085,3,"Tumor, yolk sac AND mixed teratoma [2024+]",alternate
+9085,3,Yolk sac tumor AND mixed teratoma [2024+],alternate
 9085,3,"Germ cell tumor, mixed",alternate
 9085,3,Mixed seminoma and teratoma,alternate
 9086,3,Germ cell tumors with associated hematological malignancy (C37.9),preferred
@@ -4642,7 +4769,10 @@
 9104,1,"Trophoblastic tumor, placental site (C58.9)",alternate
 9104,1,"Tumor, placental site trophoblastic (C58.9)",alternate
 9104,1,"Tumor, trophoblastic, placental site (C58.9)",alternate
-9104,3,Malignant placental site trophoblastic tumor (C58.9),preferred
+9104,3,Placental site trophoblastic tumor of testis (C62._) [REPORTABLE FOR C62._ ONLY 2024+],preferred
+9104,3,"Trophoblastic tumor of testis, placental site (C62._) [REPORTABLE FOR C62._ ONLY 2024+]",alternate
+9104,3,"Tumor, placental site trophoblastic of testis (C62._) [REPORTABLE FOR C62._ ONLY 2024+]",alternate
+9104,3,"Tumor, trophoblastic, placental site of testis (C62._) [REPORTABLE FOR C62._ ONLY 2024+]",alternate
 9105,3,"Trophoblastic tumor, epithelioid",preferred
 9105,3,Epithelioid trophoblastic tumor,alternate
 9105,3,"Tumor, trophoblastic, epithelioid",alternate
diff --git a/docs/naaccr-lookups/lookups/histologicTypeIcdO3_preferredTermsOnly.csv b/docs/naaccr-lookups/lookups/histologicTypeIcdO3_preferredTermsOnly.csv
index cbeaa1fa..581c4da2 100644
--- a/docs/naaccr-lookups/lookups/histologicTypeIcdO3_preferredTermsOnly.csv
+++ b/docs/naaccr-lookups/lookups/histologicTypeIcdO3_preferredTermsOnly.csv
@@ -101,6 +101,7 @@
 8096/0,Intraepidermal epithelioma of Jadassohn (C44._)
 8325/0,Metanephric adenoma (C64._)
 8097/3,"Basal cell carcinoma, nodular (C44._)"
+8044/3,"Small cell carcinoma, intermediate cell"
 8098/3,Adenoid basal cell carcinoma (C53._)
 8100/0,Trichoepithelioma (C44._)
 8101/0,Trichofolliculoma (C44._)
@@ -197,6 +198,8 @@
 8215/3,Adenocarcinoma of anal glands (C21.1)
 8220/0,Adenomatous polyposis coli (C18._)
 8220/2,Adenocarcinoma in situ in adenomatous polyposis coli (C18._)
+8100/3,Trichoblastic carcinoma (C44._) [2022+]
+8211/2,"Tubular adenoma, high grade [2022+; NOT REPORTABLE; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY.]"
 8220/3,Adenocarcinoma in adenomatous polyposis coli (C18._)
 8221/0,Multiple adenomatous polyps
 8221/2,Adenocarcinoma in situ in multiple adenomatous polyposis coli
@@ -289,6 +292,7 @@
 8331/3,Follicular adenocarcinoma well differentiated (C73.9)
 8332/3,Follicular adenocarcinoma trabecular (C73.9)
 8333/0,"Microfollicular adenoma, NOS (C73.9)"
+8243/3,Goblet cell adenocarcinoma [2022+]
 8333/3,Fetal adenocarcinoma
 8334/0,Macrofollicular adenoma (C73.9)
 8335/3,"Follicular carcinoma, minimally invasive (C73.9)"
@@ -378,6 +382,9 @@
 8452/1,Solid pseudopapillary tumor (C25._)
 8452/3,Solid pseudopapillary carcinoma (C25._)
 8380/3,Endometrioid adenocarcinoma
+8380/2,Endometrioid intraepithelial neoplasia (C54._) [2018+; REPORTABLE 2021+]
+8406/3,Syringocystadenocarcinoma papilliferum [2022+]
+8409/2,Porocarcinoma in situ [2022+]
 8453/0,Intraductal papillary-mucinous adenoma (C25._)
 8453/2,"Intraductal papillary-mucinous carcinoma, non-invasive (C25._)"
 8453/3,"Intraductal papillary-mucinous carcinoma, invasive (C25._)"
@@ -465,6 +472,7 @@
 8521/3,Infiltrating ductular carcinoma (C50._)
 8472/2,Papillary mucinous carcinoma in situ
 9563/0,"Nerve sheath tumor, NOS"
+8503/2,"Ductal carcinoma in situ, papillary (C50._)"
 8571/3,Adenocarcinoma with cartilaginous and osseous metaplasia
 8572/0,Adenoma with spindle cell metaplasia
 8572/3,Adenocarcinoma with spindle cell metaplasia
@@ -660,6 +668,8 @@
 8840/3,Myxosarcoma (C49._)
 8841/1,Angiomyxoma (C49._)
 8841/3,"Angiomyxoma, malignant (C49._)"
+8821/1,Aggressive fibromatosis
+8821/3,"Aggressive fibromatosis, malignant (C49._) [pre-2023]"
 8842/0,Ossifying fibromyxoid tumor
 8842/3,"Ossifying fibromyxoid tumor, malignant"
 8850/0,"Lipoma, NOS"
@@ -794,7 +804,6 @@
 9055/3,"Multicystic mesothelioma, malignant (C48._)"
 9060/2,"Dysgerminoma, in situ (C56.9 [F], C62._[M])"
 9060/3,"Dysgerminoma (C56.9 [F], C62._[M])"
-9061/2,"Seminoma, in situ (C62._)"
 9061/3,"Seminoma, NOS (C62._)"
 9062/3,"Seminoma, anaplastic (C62._)"
 9063/2,"Spermatocytic seminoma, in situ (C62._)"
@@ -802,15 +811,12 @@
 9064/2,Intratubular malignant germ cells (C62._)
 9064/3,Germinoma (C62._)
 9065/3,"Germ cell tumor, nonseminomatous (C62._)"
-9070/2,"Embryonal carcinoma, NOS, in situ"
 9070/3,"Embryonal carcinoma, NOS"
 9071/3,"Yolk sac tumor (C56.9 [F], C62._[M])"
 9072/3,Polyembryoma
 9073/1,"Gonadoblastoma (C56.9 [F], C62._[M])"
 9080/0,"Teratoma, benign"
 9080/1,"Teratoma, NOS"
-9080/2,"Teratoma, in situ"
-9080/3,"Teratoma, malignant, NOS"
 9081/2,"Teratocarcinoma, in situ (C22.0)"
 9081/3,Teratocarcinoma (C22.0)
 9082/3,"Malignant teratoma, undifferentiated"
@@ -834,7 +840,6 @@
 9103/0,Partial hydatidiform mole (C58.9)
 9103/3,"Partial hydatidiform mole, malignant (C58.9)"
 9104/1,Placental site trophoblastic tumor (C58.9)
-9104/3,Malignant placental site trophoblastic tumor (C58.9)
 9105/3,"Trophoblastic tumor, epithelioid"
 9110/0,"Mesonephroma, benign"
 9110/1,"Mesonephric tumor, NOS"
@@ -875,6 +880,7 @@
 9180/0,"Osteoma, NOS (C40._, C41._)"
 9180/3,"Osteosarcoma, NOS (C40._, C41._)"
 9181/3,"Chondroblastic osteosarcoma (C40._, C41._)"
+9110/3,"Adenocarcinoma, HPV-independent, mesonephric type [2021+]"
 9182/3,"Fibroblastic osteosarcoma (C40._, C41._)"
 9183/3,"Telangiectatic osteosarcoma (C40._, C41._)"
 9184/3,"Osteosarcoma in Paget disease of bone (C40._, C41._)"
@@ -973,6 +979,8 @@
 9384/3,"Supependymal giant cell astrocytoma, malignant (C71._)"
 9390/0,"Choroid plexus papilloma, NOS (C71.5)"
 9390/1,Atypical choroid plexus papilloma (C71.5)
+9200/0,"Osteoblastoma, NOS (C40._, C41._) [PRE-2022 ONLY. FOR 2022+ USE CODE 9200/1; NOT REPORTABLE]"
+9200/1,"Osteoblastoma, NOS (C40._, C41._) [2022+. FOR PRE-2022, USE CODE 9200/0; NOT REPORTABLE]"
 9390/3,"Choroid plexus papilloma, malignant (C71.5)"
 9392/3,"Ependymoma, anaplastic (C71._)"
 9393/0,"Papillary ependymoma, benign (C71._)"
@@ -1072,6 +1080,8 @@
 9580/0,"Granular cell tumor, NOS (C49._)"
 9500/0,"Neuroblastoma, benign"
 9500/3,"Neuroblastoma, NOS"
+9391/3,Sellar ependymoma (C75.1) [2021+]
+9480/3,"Cerebellar sarcoma, NOS (C71.6) [obs]"
 9580/3,"Granular cell tumor, malignant (C49._)"
 9581/3,Alveolar soft part sarcoma (C49._)
 9582/0,Granular cell tumor of the sellar region (C49._)
@@ -1157,6 +1167,7 @@
 9768/1,T gamma-lymphoproliferative disease
 9769/1,Immunoglobulin deposition disease
 9769/3,"Immunoglobulin deposition disease, malignant"
+9699/3,"Marginal zone B-cell lymphoma, NOS [SEE HEMATOPOIETIC DATABASE FOR REPORTING]"
 9800/3,"Leukemia, NOS (C42.1)"
 9801/3,Acute undifferentiated leukemia (C42.1)
 9805/3,"Acute biphenotypic leukemia [OBS], See codes 9806/3-9809/3 (ICD-O-3 update) (C42.1)"
@@ -1316,6 +1327,7 @@
 9715/3,"Anaplastic large cell lymphoma, ALK negative [2021+]"
 9725/1,Hydroa vacciniforme-like lymphoproliferative disorder [2021 AND LATER NOT REPORTABLE. FOR PRE-2010 USE CODE 9725/3]
 9749/3,Erdheim-Chester disease [2021+]
+8509/3,Tall cell carcinoma with reversed polarity [2022+]
 9761/1,IgM monoclonal gammopathy of undetermined significance [2021+]
 9819/3,"B lymphoblastic leukemia/lymphoma, BCR-ABL-like [2021+]"
 9823/1,"Monoclonal B-cell lymphocytosis, CLL-type [2021+]"
@@ -1342,44 +1354,35 @@
 9509/0,Multinodular and vacuolating neuronal tumor (MVNT) (C71.2) [2023+. FOR PRE-2023 USE 9505/0]
 9509/3,Diffuse leptomeningeal glioneuronal tumor (C71._) [2023+]
 9749/1,Juvenile xanthogranuloma (C71.5) [2023+; SEE HEMATOPOIETIC DATABASE FOR REPORTING]
-8976/3,Gastroblastoma (C16._) [2022+]
 9222/1,Atypical cartilaginous tumor [2021+]
 9222/3,"Chondrosarcoma, grade 1 (C40._, C41._) [REPORTABLE 2022+. FOR PRE-2022 USE CODE 9222/1]"
-8044/3,"Small cell carcinoma, intermediate cell"
-8100/3,Trichoblastic carcinoma (C44._) [2022+]
 8144/2,"Intestinal-type adenoma, high grade (C16._, C17._) [REPORTABLE 2022+ FOR STOMACH AND SMALL INTESTINE ONLY; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY.]"
-8211/2,"Tubular adenoma, high grade [2022+; NOT REPORTABLE; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY.]"
 8213/2,"Serrated dysplasia, high grade (C16._, C17._) [REPORTABLE 2022+ FOR STOMACH AND SMALL INTESTINE ONLY; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY.]"
-8243/3,Goblet cell adenocarcinoma [2022+]
-8380/2,Endometrioid intraepithelial neoplasia (C54._) [2018+; REPORTABLE 2021+]
-8406/3,Syringocystadenocarcinoma papilliferum [2022+]
-8409/2,Porocarcinoma in situ [2022+]
 8455/2,"Intraductal oncocytic papillary neoplasm, NOS (C25._) [2022+]"
 8455/3,Intraductal oncocytic papillary neoplasm with associated invasive carcinoma (C25._) [2022+]
 8480/1,Low grade appendiceal mucinous neoplasm (LAMN) (C18.1) [2018-2021 NOT REPORTABLE; 2022+ USE 8480/2 PER STANDARD SETTERS SINCE TERM AND CORRESPONDING CODE NOT INCLUDED IN ICD-O-3.2; SEE STANDARD SETTER REQUIREMENTS FOR REPORTABILITY]
 8480/2,High grade appendiceal mucinous neoplasm (HAMN) (C181) [2022+]
 8483/3,"Adenocarcinoma, HPV-associated (C53._) [2021+]"
 8484/3,"Adenocarcinoma, HPV-independent, NOS (C53._) [2021+]"
-8503/2,"Ductal carcinoma in situ, papillary (C50._)"
-8509/3,Tall cell carcinoma with reversed polarity [2022+]
 8693/1,"Extra-adrenal paraganglioma, NOS [PRE-2021 ONLY. FOR 2021+ USE CODE 8693/3.]"
 8693/3,"Extra-adrenal paraganglioma, NOS [REPORTABLE 2021+]"
-8821/1,Aggressive fibromatosis
-8821/3,"Aggressive fibromatosis, malignant (C49._) [pre-2023]"
 8859/3,Myxoid pleomorphic liposarcoma [2022+]
-9110/3,"Adenocarcinoma, HPV-independent, mesonephric type [2021+]"
+8976/3,Gastroblastoma (C16._) [2022+]
 9111/3,"Mesonephric-like adenocarcinoma (C54._, C56.9) [2022+]"
 9174/1,"Lymphangiomyomatosis [PRE-2023, NOT REPORTABLE. FOR 2023+ USE CODE 9174/3]"
-9200/0,"Osteoblastoma, NOS (C40._, C41._) [PRE-2022 ONLY. FOR 2022+ USE CODE 9200/1; NOT REPORTABLE]"
-9200/1,"Osteoblastoma, NOS (C40._, C41._) [2022+. FOR PRE-2022, USE CODE 9200/0; NOT REPORTABLE]"
 9366/3,Round cell sarcoma with EWSR1-non-ETS fusions [2022+]
 9367/3,CIC-rearranged sarcoma [2022+]
 9368/3,Sarcoma with BCOR genetic alterations [2022+]
-9391/3,Sellar ependymoma (C75.1) [2021+]
 9421/1,"Diffuse astrocytoma, MYB- or MYBL1-altered (C71._) [2023+]"
 9421/3,High-grade astrocytoma with piloid features (HGAP) (C71._) [2023+]
 9473/3,"Central primitive neuroectodermal tumor, NOS (C71._)"
-9480/3,"Cerebellar sarcoma, NOS (C71.6) [obs]"
 9505/0,Multinodular and vacuolating neuronal tumor (MVNT) (C71.2) [FOR USE 2021-2022. FOR 2023+ USE 9509/0]
-9699/3,"Marginal zone B-cell lymphoma, NOS [SEE HEMATOPOIETIC DATABASE FOR REPORTING]"
 9738/1,HHV8-positive germinotropic-lymphoproliferative disorder
+8361/1,Non-functioning juxtaglomerular cell tumor [2024+; NOT REPORTABLE]
+8590/0,Myoid gonadal stromal tumor [2024+; NOT REPORTABLE]
+9071/2,Intratubular yolk sac tumor [2024+]
+9061/2,Intratubular seminoma (C62._) [2024+]
+9070/2,Intratubular embryonal carcinoma [2024+]
+9080/2,Intratubular teratoma [2024+]
+9104/3,Placental site trophoblastic tumor of testis (C62._) [REPORTABLE FOR C62._ ONLY 2024+]
+9080/3,"Teratoma, postpubertal-type [2024+]"
diff --git a/docs/naaccr-lookups/lookups/morphCodingSysCurrent.csv b/docs/naaccr-lookups/lookups/morphCodingSysCurrent.csv
index 375e81ce..eb3279a8 100644
--- a/docs/naaccr-lookups/lookups/morphCodingSysCurrent.csv
+++ b/docs/naaccr-lookups/lookups/morphCodingSysCurrent.csv
@@ -11,3 +11,4 @@ A,"ICD-O, Third Edition, plus WHO new terms used for conditions, effective 1/1/2
 B,"ICD-O 3.2, effective 1/1/2021"
 C,"ICD-O-3.2, plus, WHO new terms used for conditions, effective 1/1/2022"
 D,"ICD-O-3.2, plus, WHO new terms used for conditions, effective 1/1/2023***"
+E,"ICD-O-3.2, plus, WHO new terms used for conditions, effective 1/1/2024***"
diff --git a/docs/naaccr-lookups/lookups/morphCodingSysOriginl.csv b/docs/naaccr-lookups/lookups/morphCodingSysOriginl.csv
index 375e81ce..eb3279a8 100644
--- a/docs/naaccr-lookups/lookups/morphCodingSysOriginl.csv
+++ b/docs/naaccr-lookups/lookups/morphCodingSysOriginl.csv
@@ -11,3 +11,4 @@ A,"ICD-O, Third Edition, plus WHO new terms used for conditions, effective 1/1/2
 B,"ICD-O 3.2, effective 1/1/2021"
 C,"ICD-O-3.2, plus, WHO new terms used for conditions, effective 1/1/2022"
 D,"ICD-O-3.2, plus, WHO new terms used for conditions, effective 1/1/2023***"
+E,"ICD-O-3.2, plus, WHO new terms used for conditions, effective 1/1/2024***"
diff --git a/docs/naaccr-lookups/lookups/naaccrRecordVersion.csv b/docs/naaccr-lookups/lookups/naaccrRecordVersion.csv
index 881912b3..c362133f 100644
--- a/docs/naaccr-lookups/lookups/naaccrRecordVersion.csv
+++ b/docs/naaccr-lookups/lookups/naaccrRecordVersion.csv
@@ -10,6 +10,7 @@
 210,2021 Version 21
 220,2022 Version 22
 230,2023 Version 23
+240,2024 Version 24
 4,1995 Version 4.0
 5,1996 and 1997 Version 5.0 or Version 5.1
 6,1998 Version 6
diff --git a/docs/naaccr-lookups/lookups/pediatricId.csv b/docs/naaccr-lookups/lookups/pediatricId.csv
new file mode 100644
index 00000000..dab61c93
--- /dev/null
+++ b/docs/naaccr-lookups/lookups/pediatricId.csv
@@ -0,0 +1,33 @@
+1a1,Acute Lymphoblastic Leukemia
+2a,Hodgkin Lymphoma
+2b2,NHL: Mature B-cell lymphomas
+2b3,NHL: Mature T-cell and NK-cell lymphomas
+2b4,NHL: NOS
+2c,NHL: Burkitt lymphoma
+3a,Ependymoma
+3b,Astrocytoma
+3c1,Medulloblastoma
+3c2,Medulloblastoma: pNET
+3c3,Medulloblastoma: Medulloepithelioma
+3c4,Medulloblastoma: Atypical teratoid/rhabdoid
+3e3,Medulloblastoma: Pineoblastoma
+4a,Neuroblastoma
+5,Retinoblastoma
+6a1,Renal Tumors: Nephroblastoma
+6a2,Renal Tumors: Rhabdoid Renal Tumor
+6a3,Renal Tumors: Kidney Sarcomas
+6a4,Renal Tumors: Ewing Sarcoma of Kidney
+6c,Renal Tumors: Unspecified Malignant Renal Tumors
+7a,Hepatoblastoma
+8a,Malignant Bone Tumors: Osteosarcoma
+8b,Malignant Bone Tumors: Chondrosarcomas
+8c,Malignant Bone Tumors: Ewing
+8d,Malignant Bone Tumors: Other specified
+8e,Malignant Bone Tumors: Unspecified
+9a,Rhabdomyosarcoma
+9b,Non-Rhabdomyosarcoma: Fibrosarcomas
+9d,Non-Rhabdomyosarcoma: Other specified
+9e,Non-Rhabdomyosarcoma: Unspecified
+10c1,Testicular
+10c2,Ovarian
+XX,Adult/Other Non-Pediatric
diff --git a/docs/naaccr-lookups/lookups/placeOfDeath.csv b/docs/naaccr-lookups/lookups/placeOfDeath.csv
index 93cc1324..9807401e 100644
--- a/docs/naaccr-lookups/lookups/placeOfDeath.csv
+++ b/docs/naaccr-lookups/lookups/placeOfDeath.csv
@@ -252,6 +252,141 @@
 723,Micronesian Islands (Historic)
 725,Polynesian Islands (Historic)
 750,Antarctica
+800,Aruba
+801,Anguilla
+802,Aland Islands
+803,Andorra
+804,United Arab Emirates (the)
+805,Armenia
+806,French Southern Territories (the)
+807,Antigua and Barbuda
+808,Azerbaijan
+809,Benin
+810,"Bonaire, Saint Eustatius and Saba"
+811,Burkina Faso
+812,Bahrain
+813,Bosnia and Herzogovina
+814,Saint Barthélemy
+815,Barbados
+816,Brunei Darussalam
+817,Bhutan
+818,Bouvet Island
+819,Botswana
+820,Central African Republic (the)
+821,Alberta
+822,Manitoba
+823,New Brunswick
+824,Newfoundland and Labrador
+825,Nova Scotia
+826,Northwest Territories
+827,Prince Edward Island
+828,Saskatchewan
+829,Yukon
+830,Cocos (Keeling) Islands (the)
+831,Côte d'Ivoire
+832,Cameroon
+833,Congo (the)
+834,Comoros (the)
+835,Cabo Verde (formerly Cape Verde)
+836,Curacao
+837,Christmas Island
+838,Cayman Islands (the)
+839,Czechia (formerly Czech Republic)
+840,Dominica
+841,England
+842,Eritrea
+843,Western Sahara
+844,Ethiopia
+845,Fiji
+846,Faroe Islands (the)
+847,Gabon
+848,Georgia
+849,Guernsey
+850,Ghana
+851,Guinea
+852,Guadeloupe
+853,Gambia (the)
+854,Guinea Bissau
+855,Equatorial Guinea
+856,Grenada
+857,Heard Island and McDonald Islands
+858,Croatia
+859,Isle of Man
+860,British Indian Ocean Territory (the)
+861,Israel
+862,Jersey
+863,Kazakhstan
+864,Kyrgyzstan
+865,Saint Kitts and Nevis
+866,Kuwait
+867,Liberia
+868,Saint Lucia
+869,Lesotho
+870,Saint-Martin (French part)
+871,Monaco
+872,Moldova (the Republic of)
+873,North Macedonia
+874,Mali
+875,Montenegro
+876,Mauritania
+877,Montserrat
+878,Martinique
+879,Mauritius
+880,Malaysia
+881,Mayotte
+882,Namibia
+883,New Caledonia
+884,Niger
+885,Norfolk Island
+886,Niue
+887,Nauru
+888,Oman
+889,Pitcairn Islands
+890,Papua New Guinea
+891,Korea (the Democratic People's Republic of) (used for North Korea)
+892,"Palestine, State of"
+893,French Polynesia
+894,Qatar
+895,Réunion
+896,Saudi Arabia
+897,Sudan
+898,Senegal
+899,Singapore
+900,South Georgia and the South Sandwich Islands
+901,"Saint Helena, Ascension and Tristan da Cunha"
+902,Svalbard and Jan Mayen
+903,Solomon Islands
+904,Sierra Leone
+905,San Marino
+906,Serbia
+907,South Sudan
+908,Sao Tome and Principe
+909,Slovakia
+910,Slovenia
+911,Eswatini (formerly Swaziland)
+912,Sint Maarten (Dutch part)
+913,Seychelles
+914,Turks and Caicos Islands (the)
+915,Chad
+916,Togo
+917,Tajikistan
+918,Turkmenistan
+919,Timor-Leste
+920,Tonga
+921,Trinidad and Tobago
+922,Ukraine
+923,Armed Forces Americas (except Canada)
+924,"Armed Forces Europe, the Middle East, and Canada"
+925,Armed Forces Pacific
+926,Uzbekistan
+927,Holy See (the) (Vatican City)
+928,Saint Vincent and the Grenadines
+929,Virgin Islands (British)
+930,Vanuatu
+931,Wallis and Futuna
+932,Samoa
+933,Yemen
+934,South Africa
 997,"Not applicable, patient alive-Place of Death only"
 998,"Not United States, NOS"
 999,Unknown
diff --git a/docs/naaccr-lookups/lookups/placeOfDeathCountry.csv b/docs/naaccr-lookups/lookups/placeOfDeathCountry.csv
index a7099c81..238d0999 100644
--- a/docs/naaccr-lookups/lookups/placeOfDeathCountry.csv
+++ b/docs/naaccr-lookups/lookups/placeOfDeathCountry.csv
@@ -213,7 +213,7 @@ SUR,Suriname
 SVK,Slovakia
 SVN,Slovenia
 SWE,Sweden
-SWZ,Swaziland
+SWZ,Eswatini (formerly Swaziland)
 SXM,Sint Maarten (Dutch part)
 SYC,Seychelles
 SYR,Syrian Arab Republic
diff --git a/docs/naaccr-lookups/lookups/primarySite.csv b/docs/naaccr-lookups/lookups/primarySite.csv
index 674183a2..67d41253 100644
--- a/docs/naaccr-lookups/lookups/primarySite.csv
+++ b/docs/naaccr-lookups/lookups/primarySite.csv
@@ -170,8 +170,8 @@ C422,Spleen
 C423,"Reticuloendothelial system,NOS"
 C424,"Hematopoietic system, NOS"
 C440,"Skin of lip, NOS"
-C441,Eyelid
-C442,External ear
+C441,Eyelid (Skin)
+C442,External Ear (Skin)
 C443,Skin of other and unspecified parts of face
 C444,Skin of scalp and neck
 C445,Skin of trunk
diff --git a/docs/naaccr-lookups/lookups/radLocationOfRx.csv b/docs/naaccr-lookups/lookups/radLocationOfRx.csv
index 0e63cfbb..40b8a0ff 100644
--- a/docs/naaccr-lookups/lookups/radLocationOfRx.csv
+++ b/docs/naaccr-lookups/lookups/radLocationOfRx.csv
@@ -1,7 +1,7 @@
 0,No radiation treatment
 1,All radiation treatment at this facility
-2,"Regional treatment at this facility, boost elsewhere"
-3,"Boost radiation at this facility, regional elsewhere"
+2,"Radiation started at reporting facility, continued elsewhere"
+3,"Radiation started elsewhere, continues at this facility"
 4,All radiation treatment elsewhere
 8,"Other, NOS"
 9,Unknown
diff --git a/docs/naaccr-lookups/lookups/rxHospReconBreast.csv b/docs/naaccr-lookups/lookups/rxHospReconBreast.csv
new file mode 100644
index 00000000..6498b1ba
--- /dev/null
+++ b/docs/naaccr-lookups/lookups/rxHospReconBreast.csv
@@ -0,0 +1,31 @@
+A000,"No reconstruction
+
+No immediate reconstruction was performed at any facility"
+A100,"Tissue expanded placement
+
+Tissue expanders were placed without implant or tissue placement"
+A200,"Direct to implant placement
+
+Permanent implant is placed immediately following resection
+
+Example: A mastectomy is performed by the breast surgeon and an implant is placed at the same time by a plastic surgeon (some general /breast surgeons may place implants, but most are placed by plastics)"
+A300,"Oncoplastic tissue rearrangement (not a formal mastopexy/reduction)
+
+Reconstruction performed with parenchymal flap or adjacent tissue transfer"
+A400,"Oncoplastic reduction and/or mastopexy
+
+Breast conserving resection and a breast reduction/lift is performed"
+A500,"Oncoplastic reconstruction with regional tissue flaps
+
+Breast conserving resection and reconstruction is performed with skin flaps"
+A600,"Mastectomy reconstruction with autologous tissue, source not specified
+
+Autologous tissue source is unknown or not specified"
+A610,Mastectomy reconstruction WITH abdominal tissue
+A620,Mastectomy reconstruction WITH thigh tissue
+A630,Mastectomy reconstruction WITH gluteal tissue
+A640,Mastectomy reconstruction WITH back tissue
+A900,"Reconstruction performed, method unknown"
+A970,"Implant based reconstruction, NOS"
+A980,"Autologous tissue-based reconstruction, NOS"
+A990,Unknown if immediate reconstruction was performed
diff --git a/docs/naaccr-lookups/lookups/rxSummReconBreast.csv b/docs/naaccr-lookups/lookups/rxSummReconBreast.csv
new file mode 100644
index 00000000..6498b1ba
--- /dev/null
+++ b/docs/naaccr-lookups/lookups/rxSummReconBreast.csv
@@ -0,0 +1,31 @@
+A000,"No reconstruction
+
+No immediate reconstruction was performed at any facility"
+A100,"Tissue expanded placement
+
+Tissue expanders were placed without implant or tissue placement"
+A200,"Direct to implant placement
+
+Permanent implant is placed immediately following resection
+
+Example: A mastectomy is performed by the breast surgeon and an implant is placed at the same time by a plastic surgeon (some general /breast surgeons may place implants, but most are placed by plastics)"
+A300,"Oncoplastic tissue rearrangement (not a formal mastopexy/reduction)
+
+Reconstruction performed with parenchymal flap or adjacent tissue transfer"
+A400,"Oncoplastic reduction and/or mastopexy
+
+Breast conserving resection and a breast reduction/lift is performed"
+A500,"Oncoplastic reconstruction with regional tissue flaps
+
+Breast conserving resection and reconstruction is performed with skin flaps"
+A600,"Mastectomy reconstruction with autologous tissue, source not specified
+
+Autologous tissue source is unknown or not specified"
+A610,Mastectomy reconstruction WITH abdominal tissue
+A620,Mastectomy reconstruction WITH thigh tissue
+A630,Mastectomy reconstruction WITH gluteal tissue
+A640,Mastectomy reconstruction WITH back tissue
+A900,"Reconstruction performed, method unknown"
+A970,"Implant based reconstruction, NOS"
+A980,"Autologous tissue-based reconstruction, NOS"
+A990,Unknown if immediate reconstruction was performed
diff --git a/docs/naaccr-lookups/lookups/schemaId.csv b/docs/naaccr-lookups/lookups/schemaId.csv
index 34405916..da98a8d1 100644
--- a/docs/naaccr-lookups/lookups/schemaId.csv
+++ b/docs/naaccr-lookups/lookups/schemaId.csv
@@ -39,13 +39,13 @@
 00278,Biliary Other
 00280,Pancreas
 00288,Digestive Other
-00290,NET Stomach
-00301,NET Duodenum
-00302,NET Ampulla of Vater
-00310,NET Jejunum and Ileum
-00320,NET Appendix
-00330,NET Colon and Rectum
-00340,NET Pancreas
+00290,NET Stomach [8th: 2018-2023]
+00301,NET Duodenum [8th: 2018-2023]
+00302,NET Ampulla of Vater [8th: 2018-2023]
+00310,NET Jejunum and Ileum [8th: 2018-2023]
+00320,NET Appendix [8th: 2018-2023]
+00330,NET Colon and Rectum [8th: 2018-2023]
+00340,NET Pancreas [8th: 2018-2023]
 00350,Thymus
 00358,Trachea
 00360,Lung
@@ -67,7 +67,7 @@
 00470,Melanoma Skin
 00478,Skin Other
 00480,Breast
-00500,Vulva
+00500,Vulva [8th: 2018-2023]
 00510,Vagina
 00520,Cervix [8th: 2018-2020]
 00528,Cervix Sarcoma
@@ -119,6 +119,14 @@
 00830,HemeRetic
 09190,Appendix [V9: 2023+]
 09210,Anus [V9: 2023+]
+09290,NET Stomach [V9: 2024+]
+09301,NET Duodenum [V9: 2024+]
+09302,NET Ampulla of Vater [V9: 2024+]
+09310,NET Jejunum and Ileum [V9: 2024+]
+09320,NET Appendix [V9: 2024+]
+09330,NET Colon and Rectum [V9: 2024+]
+09340,NET Pancreas [V9: 2024+]
+09500,Vulva [V9: 2024+]
 09520,Cervix [V9: 2021+]
 09721,Brain [V9: 2023+]
 09722,CNS Other [V9: 2023+]
diff --git a/docs/naaccr-lookups/lookups/schemaIdVersionCurrent.csv b/docs/naaccr-lookups/lookups/schemaIdVersionCurrent.csv
index c9b01c89..9c9f93a0 100644
--- a/docs/naaccr-lookups/lookups/schemaIdVersionCurrent.csv
+++ b/docs/naaccr-lookups/lookups/schemaIdVersionCurrent.csv
@@ -9,3 +9,4 @@
 2.0,2.0
 2.1,2.1
 3.0,3.0
+3.1,3.1
diff --git a/docs/naaccr-lookups/lookups/schemaIdVersionOriginal.csv b/docs/naaccr-lookups/lookups/schemaIdVersionOriginal.csv
index c9b01c89..9c9f93a0 100644
--- a/docs/naaccr-lookups/lookups/schemaIdVersionOriginal.csv
+++ b/docs/naaccr-lookups/lookups/schemaIdVersionOriginal.csv
@@ -9,3 +9,4 @@
 2.0,2.0
 2.1,2.1
 3.0,3.0
+3.1,3.1
diff --git a/docs/naaccr-lookups/naaccr-lookups-240-sas-formats.sas.gz b/docs/naaccr-lookups/naaccr-lookups-240-sas-formats.sas.gz
new file mode 100644
index 00000000..5c6ac871
Binary files /dev/null and b/docs/naaccr-lookups/naaccr-lookups-240-sas-formats.sas.gz differ
diff --git a/docs/naaccr-lookups/naaccr-lookups-240.zip b/docs/naaccr-lookups/naaccr-lookups-240.zip
new file mode 100644
index 00000000..291fa019
Binary files /dev/null and b/docs/naaccr-lookups/naaccr-lookups-240.zip differ
diff --git a/src/test/java/lab/NaaccrLookupsToSasFormats.java b/src/test/java/lab/NaaccrLookupsToSasFormats.java
index a6dc173c..ac79d76f 100644
--- a/src/test/java/lab/NaaccrLookupsToSasFormats.java
+++ b/src/test/java/lab/NaaccrLookupsToSasFormats.java
@@ -24,7 +24,7 @@
 public class NaaccrLookupsToSasFormats {
 
     public static void main(String[] args) throws IOException, CsvValidationException {
-        String version = "230";
+        String version = "240";
 
         File inFile = new File(System.getProperty("user.dir") + "\\docs\\naaccr-lookups\\naaccr-lookups-" + version + ".zip");
         File outFile = new File(System.getProperty("user.dir") + "\\docs\\naaccr-lookups\\naaccr-lookups-" + version + "-sas-formats.sas.gz");
diff --git a/src/test/java/lab/NaaccrLookupsViewer.java b/src/test/java/lab/NaaccrLookupsViewer.java
index c91fc519..261fce5a 100644
--- a/src/test/java/lab/NaaccrLookupsViewer.java
+++ b/src/test/java/lab/NaaccrLookupsViewer.java
@@ -42,9 +42,12 @@
 import com.imsweb.seerutilsgui.SeerGuiUtils;
 import com.imsweb.seerutilsgui.SeerList;
 
+/**
+ * Lookups need to be generated from the "ExtractLookupsLab" in SEER*DMS.
+ */
 public class NaaccrLookupsViewer extends JFrame {
 
-    private static final File _DIR = new File("C:\\dev\\tmp\\naaccr-lookups\\lookups");
+    private static final File _DIR = new File("C:\\dev\\temp\\naaccr-lookups\\naaccr-lookups-240");
 
     private JTextArea _textArea = null;