diff --git a/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml b/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml
index 5ee28ba0..37b1d204 100644
--- a/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml
+++ b/cal_and_val/thermal/f3-vehicles/2021_Hyundai_Sonata_Hybrid_Blue.yaml
@@ -14,7 +14,71 @@ pt_type:
       pwr_out_max_watts: 50000.0
       energy_capacity_joules: 5760000.0
       eff_interp:
-        Interp0D: 0.9848857801796105
+        Interp2D:
+          x:
+            - -5.0
+            - -3.0
+            - -1.0
+            - -0.5
+            - -0.1
+            - 0.1
+            - 0.5
+            - 1.0
+            - 2.0
+            - 3.0
+            - 5.0
+          y:
+            - 23.0
+            - 30.0
+            - 45.0
+            - 55.0
+          f_xy:
+            - - 0.892085814015878
+              - 0.91092
+              - 0.929788
+              - 0.929788
+            - - 0.935630351894604
+              - 0.946773
+              - 0.957986
+              - 0.957986
+            - - 0.978612548997097
+              - 0.982298
+              - 0.986015
+              - 0.986015
+            - - 0.989309767361546
+              - 0.991151
+              - 0.993009
+              - 0.993009
+            - - 0.997862182940346
+              - 0.99823
+              - 0.998602
+              - 0.998602
+            - - 0.997883658588665
+              - 0.998247
+              - 0.998645
+              - 0.998618
+            - - 0.989234853052088
+              - 0.991108
+              - 0.993153
+              - 0.993014
+            - - 0.977987897893482
+              - 0.98189
+              - 0.986113
+              - 0.985827
+            - - 0.953873809588552
+              - 0.962378
+              - 0.971415
+              - 0.970809
+            - - 0.927243266086586
+              - 0.941245
+              - 0.955812
+              - 0.954845
+            - - 0.864025853742296
+              - 0.892934
+              - 0.921423
+              - 0.919576
+          strategy: Linear
+          extrapolate: Error
       min_soc: 0.5
       max_soc: 0.95
       save_interval: 1
@@ -34,6 +98,16 @@ pt_type:
           max_frac_from_comb: 0.5
           tstat_te_sto_kelvin: 358.15
           tstat_te_delta_kelvin: 5.0
+          tstat_interp:
+            Interp1D:
+              x:
+                - 358.15
+                - 363.15
+              f_x:
+                - 0.0
+                - 1.0
+              strategy: Linear
+              extrapolate: Clamp
           radiator_effectiveness: 0.0
           fc_eff_model:
             Exponential:
@@ -67,8 +141,8 @@ pt_type:
             - 0.35
             - 0.375
             - 0.39
-            - 0.40
-            - 0.40
+            - 0.4
+            - 0.4
             - 0.38
             - 0.37
             - 0.36