diff --git a/components/panasonic_heatpump/README.md b/components/panasonic_heatpump/README.md
index 0520be9..bac95ee 100644
--- a/components/panasonic_heatpump/README.md
+++ b/components/panasonic_heatpump/README.md
@@ -555,6 +555,10 @@ number:
       name: "Set Bivalent AP Stop Temp"
     set46:
       name: "Set Heater On Outdoor Temp"
+    set47:
+      name: "Set Heat To Cool Temp"
+    set48:
+      name: "Set Cool To Heat Temp"
 ```
 
 ### Switches
diff --git a/components/panasonic_heatpump/number/__init__.py b/components/panasonic_heatpump/number/__init__.py
index d731d2a..4c8d57f 100644
--- a/components/panasonic_heatpump/number/__init__.py
+++ b/components/panasonic_heatpump/number/__init__.py
@@ -51,6 +51,8 @@ CONF_SET36 = "set36"  # Set Bivalent Start Temp
 CONF_SET37 = "set37"  # Set Bivalent AP Start Temp
 CONF_SET38 = "set38"  # Set Bivalent AP Stop Temp
 CONF_SET46 = "set46"  # Set Heater On Outdoor Temp
+CONF_SET47 = "set47"  # Set Heat To Cool Temp
+CONF_SET48 = "set48"  # Set Cool To Heat Temp
 
 TYPES = [
     CONF_SET5,
@@ -87,6 +89,8 @@ TYPES = [
     CONF_SET37,
     CONF_SET38,
     CONF_SET46,
+    CONF_SET47,
+    CONF_SET48,
 ]
 
 
@@ -264,6 +268,14 @@ CONFIG_SCHEMA = cv.Schema(
             PanasonicHeatpumpNumber,
             unit_of_measurement=UNIT_CELSIUS,
         ).extend(number_options(-15.0, 20.0, 1.0)),
+        cv.Optional(CONF_SET47): number.number_schema(
+          PanasonicHeatpumpNumber,
+          unit_of_measurement=UNIT_CELSIUS
+        ).extend(number_options(11.0, 25.0, 1.0)),
+        cv.Optional(CONF_SET48): number.number_schema(
+          PanasonicHeatpumpNumber,
+          unit_of_measurement=UNIT_CELSIUS
+        ).extend(number_options(5.0, 14.0, 1.0)),
     }
 ).extend(cv.COMPONENT_SCHEMA)
 
diff --git a/components/panasonic_heatpump/number/panasonic_heatpump_number.cpp b/components/panasonic_heatpump/number/panasonic_heatpump_number.cpp
index d1b3bde..8fa2430 100644
--- a/components/panasonic_heatpump/number/panasonic_heatpump_number.cpp
+++ b/components/panasonic_heatpump/number/panasonic_heatpump_number.cpp
@@ -114,6 +114,12 @@ void PanasonicHeatpumpNumber::control(float value) {
   case NumberIds::CONF_SET46:
     this->parent_->set_command_byte(PanasonicCommand::setPlus128(value_int), 85);
     break;
+  case NumberIds::CONF_SET47:
+    this->parent_->set_command_byte(PanasonicCommand::setPlus128(value_int), 95);
+    break;
+  case NumberIds::CONF_SET48:
+    this->parent_->set_command_byte(PanasonicCommand::setPlus128(value_int), 96);
+    break;
   default:
     return;
   };
@@ -302,6 +308,16 @@ void PanasonicHeatpumpNumber::publish_new_state(const std::vector<uint8_t>& data
     if (this->has_state() && this->state == new_state)
       return;
     break;
+  case NumberIds::CONF_SET47:
+    new_state = PanasonicDecode::getByteMinus128(data[95]);
+    if (this->has_state() && this->state == new_state)
+      return;
+    break;
+  case NumberIds::CONF_SET48:
+    new_state = PanasonicDecode::getByteMinus128(data[96]);
+    if (this->has_state() && this->state == new_state)
+      return;
+    break;
   default:
     return;
   };
diff --git a/components/panasonic_heatpump/number/panasonic_heatpump_number.h b/components/panasonic_heatpump/number/panasonic_heatpump_number.h
index 6d15614..2fe3361 100644
--- a/components/panasonic_heatpump/number/panasonic_heatpump_number.h
+++ b/components/panasonic_heatpump/number/panasonic_heatpump_number.h
@@ -42,6 +42,8 @@ enum NumberIds : uint8_t {
   CONF_SET37,
   CONF_SET38,
   CONF_SET46,
+  CONF_SET47,
+  CONF_SET48,
 };
 
 class PanasonicHeatpumpNumber : public number::Number,
diff --git a/example_panasonic_heatpump.yaml b/example_panasonic_heatpump.yaml
index 3f1d465..0eb9b57 100644
--- a/example_panasonic_heatpump.yaml
+++ b/example_panasonic_heatpump.yaml
@@ -392,6 +392,8 @@ text_sensor:
       name: "SmartDHW"
     top141:
       name: "Quiet Mode Priority"
+    top143:
+      name: "DHW Sensor Selection"
 
 number:
   - platform: panasonic_heatpump
@@ -461,6 +463,12 @@ number:
       name: "Set Bivalent AP Start Temp"
     set38:
       name: "Set Bivalent AP Stop Temp"
+    set46:
+      name: "Set Heater On Outdoor Temp"
+    set47:
+      name: "Set Heat To Cool Temp"
+    set48:
+      name: "Set Cool To Heat Temp"
 
 switch:
   - platform: panasonic_heatpump
@@ -490,6 +498,8 @@ switch:
       name: "Set External Heat Cool Control"
     set34:
       name: "Set Bivalent Control"
+    error_reset:
+      name: "Error Reset (Restart Heatpump)"
 
 select:
   - platform: panasonic_heatpump
@@ -516,6 +526,12 @@ select:
       name: "Set Quiet Mode Priority"
     set42:
       name: "Set Pump Flow Rate Mode"
+    set43:
+      name: "Set DHW Sensor Selection"
+    set44:
+      name: "Set DHW Heater State"
+    set45:
+      name: "Set Room Heater State"
 
 climate:
   - platform: panasonic_heatpump