diff --git a/src/BMS/CRAH/CRAH_UMAS_TCP/StateUtils.cpp b/src/BMS/CRAH/CRAH_UMAS_TCP/StateUtils.cpp
index 8fdfcc1..c3e3522 100644
--- a/src/BMS/CRAH/CRAH_UMAS_TCP/StateUtils.cpp
+++ b/src/BMS/CRAH/CRAH_UMAS_TCP/StateUtils.cpp
@@ -107,16 +107,16 @@ void updateAlarms(Equipment<ModbusIP>* equipment){
 // Note: The Common Alarm is not configured to annunciate with these analog low/high alarms.
 void updateAnalogs(Equipment<ModbusIP>* equipment){
     if (equipment->getModbus_Point("RA Temp Low Alarm ON")->getValue() ==1){
-        equipment->setModbus_Point("Return Air Temp", 68.0f);
+        equipment->setModbus_Point("Return Air Temp", 60.0f);
     }
     else if (equipment->getModbus_Point("RA Temp High Alarm ON")->getValue()==1){
-        equipment->setModbus_Point("Return Air Temp", 104.0f);
+        equipment->setModbus_Point("Return Air Temp", 110.0f);
     }
 
     if (equipment->getModbus_Point("RA Humidity Low Alarm ON")->getValue()==1){
-        equipment->setModbus_Point("Return Air Humidity", 15.0f);
+        equipment->setModbus_Point("Return Air Humidity", 5.0f);
     }
     else if (equipment->getModbus_Point("RA Humidity High Alarm ON")->getValue()==1){
-        equipment->setModbus_Point("Return Air Humidity", 65.0f);
+        equipment->setModbus_Point("Return Air Humidity", 80.0f);
     }
 }
\ No newline at end of file
diff --git a/src/BMS/CRAH/CRAH_UMAS_TCP/State_Fail.cpp b/src/BMS/CRAH/CRAH_UMAS_TCP/State_Fail.cpp
index ceeb819..b9d847b 100644
--- a/src/BMS/CRAH/CRAH_UMAS_TCP/State_Fail.cpp
+++ b/src/BMS/CRAH/CRAH_UMAS_TCP/State_Fail.cpp
@@ -43,15 +43,16 @@ FailState<ModbusIP>::FailState(const std::vector<std::string>& activeAlarms) {
     addStrategy("Supply Air Temp", new SingleValueStrategy(74.0f, 1.0f, 1000));
     addStrategy("Return Air Temp", new SingleValueStrategy(86.0f, 1.0f, 1000));
     addStrategy("Return Air Humidity", new SingleValueStrategy(35.0f, 2.0f, 1000));
-    addStrategy("Speed Fan 1", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 2", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 3", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 4", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 5", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 6", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 7", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 8", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 9", new RampStrategy(0.0f, 10.0f, 1000)); 
+    addStrategy("Speed Fan 1", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 2", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 3", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 4", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 5", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 6", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 7", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 8", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 9", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Fan Speed Feedback", new RampStrategy(0.0f, 10.0f, 1000)); 
     addStrategy("Amps Fan 1", new RampStrategy(0.0f, 4.5f, 1000));   
     addStrategy("Amps Fan 2", new RampStrategy(0.0f, 4.5f, 1000));   
     addStrategy("Amps Fan 3", new RampStrategy(0.0f, 4.5f, 1000));   
diff --git a/src/BMS/CRAH/CRAH_UMAS_TCP/State_Running.cpp b/src/BMS/CRAH/CRAH_UMAS_TCP/State_Running.cpp
index a1c8f16..eda823e 100644
--- a/src/BMS/CRAH/CRAH_UMAS_TCP/State_Running.cpp
+++ b/src/BMS/CRAH/CRAH_UMAS_TCP/State_Running.cpp
@@ -44,15 +44,15 @@ template<>
 RunningState<ModbusIP>::RunningState() {
     addStrategy("Fan Min Speed", new SingleValueStrategy(30.0f, 0.0f, 1000));
     addStrategy("Fan Max Speed", new SingleValueStrategy(100.0f, 0.0f, 1000));
-    addStrategy("Speed Fan 1", new RampStrategy(0.0f, 1.0f, 200));         
-    addStrategy("Speed Fan 2", new RampStrategy(0.0f, 1.0f, 200));          
-    addStrategy("Speed Fan 3", new RampStrategy(0.0f, 1.0f, 200));         
-    addStrategy("Speed Fan 4", new RampStrategy(0.0f, 1.0f, 200));  
-    addStrategy("Speed Fan 5", new RampStrategy(0.0f, 1.0f, 200));         
-    addStrategy("Speed Fan 6", new RampStrategy(0.0f, 1.0f, 200));  
-    addStrategy("Speed Fan 7", new RampStrategy(0.0f, 1.0f, 200));         
-    addStrategy("Speed Fan 8", new RampStrategy(0.0f, 1.0f, 200));  
-    addStrategy("Speed Fan 9", new RampStrategy(0.0f, 1.0f, 200));         
+    addStrategy("Speed Fan 1", new RampStrategy(0.0f, 100.0f, 200));         
+    addStrategy("Speed Fan 2", new RampStrategy(0.0f, 100.0f, 200));          
+    addStrategy("Speed Fan 3", new RampStrategy(0.0f, 100.0f, 200));         
+    addStrategy("Speed Fan 4", new RampStrategy(0.0f, 100.0f, 200));  
+    addStrategy("Speed Fan 5", new RampStrategy(0.0f, 100.0f, 200));         
+    addStrategy("Speed Fan 6", new RampStrategy(0.0f, 100.0f, 200));  
+    addStrategy("Speed Fan 7", new RampStrategy(0.0f, 100.0f, 200));         
+    addStrategy("Speed Fan 8", new RampStrategy(0.0f, 100.0f, 200));  
+    addStrategy("Speed Fan 9", new RampStrategy(0.0f, 100.0f, 200));         
     addStrategy("Amps Fan 1", new RampStrategy(15.0f, 2.5f, 1000));          
     addStrategy("Amps Fan 2", new RampStrategy(15.0f, 2.5f, 1000));  
     addStrategy("Amps Fan 3", new RampStrategy(15.0f, 2.5f, 1000));          
@@ -125,7 +125,8 @@ State<ModbusIP>* RunningState<ModbusIP>::update(Equipment<ModbusIP>* equipment)
     float BMS_Speed_Setpoint_Pct = BMS_Speed_Setpoint / 100.0f;
     float Fan_Min_Speed = getPointValue(equipment, "Fan Min Speed");
     float Fan_Max_Speed = getPointValue(equipment, "Fan Max Speed");
-    float Fan_Speed_Setpoint = BMS_Speed_Setpoint_Pct * (Fan_Max_Speed - Fan_Min_Speed) + Fan_Min_Speed;
+    float Fan_Nominal_Speed = 1900.0f;
+    float Fan_Speed_Setpoint = (BMS_Speed_Setpoint_Pct * (Fan_Max_Speed - Fan_Min_Speed) + Fan_Min_Speed)/100.0f * Fan_Nominal_Speed;
     for (int i = 0; i < 10; i++){
         std::string pointName = "Speed Fan " + std::to_string(i);
         Strategy_Behavior* strat = getStrategy(pointName);
@@ -133,10 +134,10 @@ State<ModbusIP>* RunningState<ModbusIP>::update(Equipment<ModbusIP>* equipment)
             RampStrategy* ramp = static_cast<RampStrategy*>(strat);
             if (ramp){
                 if (BMS_Speed_Setpoint > 100){
-                    Fan_Speed_Setpoint = Fan_Max_Speed;
+                    Fan_Speed_Setpoint = Fan_Max_Speed / 100.0f * Fan_Nominal_Speed; 
                 }
                 else if (BMS_Speed_Setpoint < 0){
-                    Fan_Speed_Setpoint = Fan_Min_Speed;
+                    Fan_Speed_Setpoint = Fan_Min_Speed / 100.0f * Fan_Nominal_Speed;
                 }
                 ramp->setTarget(Fan_Speed_Setpoint);
             }
diff --git a/src/BMS/CRAH/CRAH_UMAS_TCP/State_Standby.cpp b/src/BMS/CRAH/CRAH_UMAS_TCP/State_Standby.cpp
index 2b78791..90be569 100644
--- a/src/BMS/CRAH/CRAH_UMAS_TCP/State_Standby.cpp
+++ b/src/BMS/CRAH/CRAH_UMAS_TCP/State_Standby.cpp
@@ -44,15 +44,16 @@ StandbyState<ModbusIP>::StandbyState() {
     addStrategy("Supply Air Temp", new SingleValueStrategy(74.0f, 1.0f, 1000));
     addStrategy("Return Air Temp", new SingleValueStrategy(86.0f, 1.0f, 1000));
     addStrategy("Return Air Humidity", new SingleValueStrategy(35.0f, 2.0f, 1000));
-    addStrategy("Speed Fan 1", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 2", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 3", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 4", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 5", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 6", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 7", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 8", new RampStrategy(0.0f, 10.0f, 1000)); 
-    addStrategy("Speed Fan 9", new RampStrategy(0.0f, 10.0f, 1000)); 
+    addStrategy("Speed Fan 1", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 2", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 3", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 4", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 5", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 6", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 7", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 8", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Speed Fan 9", new RampStrategy(0.0f, 300.0f, 1000)); 
+    addStrategy("Fan Speed Feedback", new RampStrategy(0.0f, 10.0f, 1000)); 
     addStrategy("Amps Fan 1", new RampStrategy(0.0f, 4.5f, 1000));   
     addStrategy("Amps Fan 2", new RampStrategy(0.0f, 4.5f, 1000));   
     addStrategy("Amps Fan 3", new RampStrategy(0.0f, 4.5f, 1000));   
diff --git a/src/BMS/CRAH/CRAH_UMAS_TCP/config.h b/src/BMS/CRAH/CRAH_UMAS_TCP/config.h
index 972a36c..5829224 100644
--- a/src/BMS/CRAH/CRAH_UMAS_TCP/config.h
+++ b/src/BMS/CRAH/CRAH_UMAS_TCP/config.h
@@ -138,8 +138,15 @@ modbusMap mb_map[] =
   {IR_FLOAT,      79,    0,  "Amps Fan 9"},     
   {IR_FLOAT,      99,    0,  "CRAH Heartbeat"},                          
         
+  {HR_FLOAT,       1,    0,  "High Return Air Temp Setpoint"},  // default: 100, set locally on unit
+  {HR_FLOAT,       3,    0,  "Low Return Air Temp Setpoint"},    // default: 72, set locally on unit
+  {HR_FLOAT,       5,    0,  "High Supply Air Temp Setpoint"},   // default: 78, set locally on unit
+  {HR_FLOAT,       7,    0,  "Low Return Air Temp Setpoint"},    // default: 72, set locally on unit
+  {HR_FLOAT,       9,    0,  "High Return Humidity Setpoint"},   // default: 60, set locally on unit
+  {HR_FLOAT,      11,    0,  "Low Return Humidity Setpoint"},    // default: 20, set locally on unit
   {HR_FLOAT,      13,    0,  "Fan Speed Setpoint"},          // Receive signal from PLC
   {HR_FLOAT,      17,    0,  "Supply Air Temp Setpoint"},    // Receive signal from PLC
+  {HR_FLOAT,      19,    0,  "Return Air Temp Setpoint"},    // set locally on unit
   {HR_FLOAT,      21,    0,  "Fan Min Speed"},               // Send to PLC
   {HR_FLOAT,      23,    0,  "Fan Max Speed"},               // Send to PLC
   {HR,            25,    0,  "BMS Control Source"},          // Receive signal from PLC 0:Speed, 1:Room Temp