Index: NVDataMgmt.c
===================================================================
diff -u -r063fdf08498edf5e56f2de989d3c0c72e2c0aff5 -r3fb6e0e7e82619ef261136a2dd3eeef10df451c3
--- NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 063fdf08498edf5e56f2de989d3c0c72e2c0aff5)
+++ NVDataMgmt.c	(.../NVDataMgmt.c)	(revision 3fb6e0e7e82619ef261136a2dd3eeef10df451c3)
@@ -3914,30 +3914,30 @@
     if ( calcCRC != recordCRC )
     {
         // CRC did not pass so set all values to default
-        hdInstitutionalGroup.hdInstitutionalRecord.minBloodFlowMLPM                 = getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_BLOOD_FLOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxBloodFlowMLPM                 = getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_BLOOD_FLOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateFlowMLPM             = getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_DIALYSATE_FLOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateFlowMLPM             = getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_DIALYSATE_FLOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.minTxDurationMIN                 = getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxTxDurationMIN                 = getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_TREATMENT_DURATION );
-        hdInstitutionalGroup.hdInstitutionalRecord.minStopHeparinDispBeforeTxEndMIN = getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxStopHeparinDispBeforeTxEndMIN = getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME );
-        hdInstitutionalGroup.hdInstitutionalRecord.minSalineBolusVolumeML           = getU32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_SALINE_BOLUS_VOLUME );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxSalineBolusVolumeML           = getU32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_SALINE_BOLUS_VOLUME );
-        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateTempC                = getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateTempC                = getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
-        hdInstitutionalGroup.hdInstitutionalRecord.minArtPressLimitWindowMMHG       = getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxArtPressLimitWindowMMHG       = getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.minVenPressLimitWindowMMHG       = getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxVenPressLimitWindowMMHG       = getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW );
-        hdInstitutionalGroup.hdInstitutionalRecord.minVenAsymPressLimitMMHG         = getS32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxVenAsymPressLimitMMHG         = getS32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC );
-        hdInstitutionalGroup.hdInstitutionalRecord.minUFVolumeL                     = getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_UF_VOLUME );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxUFVolumeL                     = getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_UF_VOLUME );
-        hdInstitutionalGroup.hdInstitutionalRecord.minHeparinDispRateMLPHR           = getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxHeparinDispRateMLPHR           = getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE );
-        hdInstitutionalGroup.hdInstitutionalRecord.minHeparinBolusVolumeML          = getF32TreatmentParamLowerRangeLimit( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
-        hdInstitutionalGroup.hdInstitutionalRecord.maxHeparinBolusVolumeML          = getF32TreatmentParamUpperRangeLimit( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME );
+        hdInstitutionalGroup.hdInstitutionalRecord.minBloodFlowMLPM                 = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_BLOOD_FLOW, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxBloodFlowMLPM                 = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_BLOOD_FLOW, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateFlowMLPM             = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_DIALYSATE_FLOW, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateFlowMLPM             = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_DIALYSATE_FLOW, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minTxDurationMIN                 = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_TREATMENT_DURATION, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxTxDurationMIN                 = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_TREATMENT_DURATION, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minStopHeparinDispBeforeTxEndMIN = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxStopHeparinDispBeforeTxEndMIN = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_PRE_STOP_TIME, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minSalineBolusVolumeML           = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_SALINE_BOLUS_VOLUME, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxSalineBolusVolumeML           = getU32DefaultTreatmentParamEdge( TREATMENT_PARAM_SALINE_BOLUS_VOLUME, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minDialysateTempC                = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_DIALYSATE_TEMPERATURE, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxDialysateTempC                = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_DIALYSATE_TEMPERATURE, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minArtPressLimitWindowMMHG       = getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxArtPressLimitWindowMMHG       = getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_ART_PRES_LIMIT_WINDOW, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minVenPressLimitWindowMMHG       = getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxVenPressLimitWindowMMHG       = getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_VEN_PRES_LIMIT_WINDOW, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minVenAsymPressLimitMMHG         = getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxVenAsymPressLimitMMHG         = getS32DefaultTreatmentParamEdge( TREATMENT_PARAM_VEN_PRES_LIMIT_ASYMMETRIC, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minUFVolumeL                     = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_UF_VOLUME, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxUFVolumeL                     = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_UF_VOLUME, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minHeparinDispRateMLPHR          = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxHeparinDispRateMLPHR          = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_DISPENSE_RATE, FALSE );
+        hdInstitutionalGroup.hdInstitutionalRecord.minHeparinBolusVolumeML          = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, TRUE );
+        hdInstitutionalGroup.hdInstitutionalRecord.maxHeparinBolusVolumeML          = getF32DefaultTreatmentParamEdge( TREATMENT_PARAM_HEPARIN_BOLUS_VOLUME, FALSE );
         hdInstitutionalGroup.hdInstitutionalRecord.calibrationTime                  = getRTCTimestamp();
         hdInstitutionalGroup.hdInstitutionalRecord.crc                              = crc16 ( (U08*)&hdInstitutionalGroup.hdInstitutionalRecord,
                                                                                               sizeof( HD_INSTITUTIONAL_RECORD_T ) - sizeof( U16 ) );