diff --git a/src/CNDTYPES.DEF b/src/CNDTYPES.DEF
index 9dc446cbc..a4cee721f 100644
--- a/src/CNDTYPES.DEF
+++ b/src/CNDTYPES.DEF
@@ -531,6 +531,10 @@ PIPESEGP -- "class PIPESEG*"
 			AWHSTIER4GENERIC50 "AWHSTier4Generic50"		// 50-gal tier-4 generic
 			AWHSTIER4GENERIC65 "AWHSTier4Generic65"		// 65-gal tier-4 generic
 			AWHSTIER4GENERIC80 "AWHSTier4Generic80"		// 80-gal tier-4 generic
+
+			BRADFORDWHITEAEROTHERMRE2H50 "BradfordWhiteAeroThermRE2H50"		// 50-gal AeroTherm2023
+            BRADFORDWHITEAEROTHERMRE2H65 "BradfordWhiteAeroThermRE2H65"		// 65-gal AeroTherm2023
+            BRADFORDWHITEAEROTHERMRE2H80 "BradfordWhiteAeroThermRE2H80"		// 80-gal AeroTherm2023
 		}
 
 *choicb WHRESTYCH {			// resistance heater types
diff --git a/src/RCDEF/rcdef.cpp b/src/RCDEF/rcdef.cpp
index d56e84c8e..ea0fe9ebf 100644
--- a/src/RCDEF/rcdef.cpp
+++ b/src/RCDEF/rcdef.cpp
@@ -212,7 +212,7 @@ const int MAXFDREC=600;		// Max fields in a record. Separated from MAXFIELDS, 4-
 
 const int MAXDTH=600;		// max+1 data type handle. 800-->200 1-92 ->400 3-92. ->432(0x1b0) 2-94. ->352 (0x160) 5-95.
 							//   352->400, 1-16; 400->500, 4-16; 500->600, 9-20
-const int MAXDTC=105;		// maximum number of choices for choice data type.
+const int MAXDTC=108;		// maximum number of choices for choice data type.
 //#define MAXARRAY  20		// largest number of record array structure members * NOT checked, but should be.
 const int MAXNAMEL = 40;	// Max length of name, etc ("s" token)
 const int MAXQSTRL = 512;   // Max length for quoted string ("q" token).  assumed >= MAXNAMEL for array allocations.
diff --git a/src/dhwcalc.cpp b/src/dhwcalc.cpp
index d338175f0..3d053d5c7 100644
--- a/src/dhwcalc.cpp
+++ b/src/dhwcalc.cpp
@@ -3126,6 +3126,10 @@ RC HPWHLINK::hw_InitResistance(		// set up HPWH has EF-rated resistance heater
 	{ C_WHASHPTYCH_AWHSTIER4GENERIC65, hwatSMALL | HPWH::MODELS_AWHSTier4Generic65 },
 	{ C_WHASHPTYCH_AWHSTIER4GENERIC80, hwatSMALL | HPWH::MODELS_AWHSTier4Generic80 },
 
+	{ C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H50,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H50},
+	{ C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H65,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H65},
+	{ C_WHASHPTYCH_BRADFORDWHITEAEROTHERMRE2H80,hwatSMALL | HPWH::MODELS_BradfordWhiteAeroThermRE2H80},
+
 	{ 32767,                         HPWH::MODELS(-1) }  };
 
 	SI tableVal = presetTbl->lookup(ashpTy);