diff --git a/README.md b/README.md
index 91ab343..55b244b 100644
--- a/README.md
+++ b/README.md
@@ -8,11 +8,10 @@ ESP32 using the [ESPHome](https://esphome.io) framework.
 * Direct control without the remote.
 * Uses the [SwiCago/HeatPump](https://github.com/SwiCago/HeatPump) Arduino
   libary to talk to the unit directly via the internal `CN105` connector.
-  NOTE: REQUIRES SEVERAL FIXES - SEE [PR #155](https://github.com/SwiCago/HeatPump/pull/155)
 
 ## Requirements
-* https://github.com/geoffdavis/HeatPump#init_fix (until upstream is fixed)
-* ESPHome 1.15.0-dev or greater 
+* https://github.com/SwiCago/HeatPump
+* ESPHome 1.15.0-dev or greater
 
 ## Supported Microcontrollers
 This library should work on most ESP8266 or ESP32 platforms. It has been tested
@@ -71,7 +70,7 @@ On Hass.IO, you'll want to do something like:
 ### Step 4: Configure your ESPHome device with YAML
 
 Create an ESPHome YAML configuration with the following sections:
- * `esphome: libraries: [https://github.com/geoffdavis/HeatPump#init_fix]`
+ * `esphome: libraries: [https://github.com/SwiCago/HeatPump]`
  * `esphome: includes: [src/esphome-mitsubishiheatpump]`
  * `climate:` - set up a custom climate entry, change the Serial port as needed.
  * ESP8266 only: `logger: baud_rate: 0` - disable serial port logging on the
@@ -121,8 +120,7 @@ esphome:
   # Boards tested: ESP-01S (ESP8266), Wemos D1 Mini (ESP8266); ESP32 Wifi-DevKit2
 
   libraries:
-    #- SwiCago/HeatPump
-    - https://github.com/geoffdavis/HeatPump#init_fix
+    - SwiCago/HeatPump
 
   includes:
     - src/esphome-mitsubishiheatpump
diff --git a/espmhp.cpp b/espmhp.cpp
index 5063647..b33336f 100644
--- a/espmhp.cpp
+++ b/espmhp.cpp
@@ -8,7 +8,7 @@
  * License: BSD
  *
  * Requirements:
- * - https://github.com/geoffdavis/HeatPump#init_fix (until upstream is fixed)
+ * - https://github.com/SwiCago/HeatPump
  * - ESPHome 1.15.0-dev or greater
  */
 
diff --git a/espmhp.h b/espmhp.h
index 7d548ae..ece2aa2 100644
--- a/espmhp.h
+++ b/espmhp.h
@@ -8,12 +8,11 @@
  * License: BSD
  *
  * Requirements:
- * - https://github.com/geoffdavis/HeatPump#init_fix (until upstream is fixed)
+ * - https://github.com/SwiCago/HeatPump
  * - ESPHome 1.15.0-dev or greater
  */
 
-// Uncomment to use HeatPump callback functions (broken, causes boot failures)
-//#define USE_CALLBACKS
+#define USE_CALLBACKS
 
 #include "esphome.h"
 #include "HeatPump.h"
@@ -24,11 +23,11 @@ using namespace esphome;
 
 static const char* TAG = "MitsubishiHeatPump"; // Logging tag
 
-static const char* ESPMHP_VERSION = "1.0.2";
+static const char* ESPMHP_VERSION = "1.1.0";
 
 /* If polling interval is greater than 9 seconds, the HeatPump
 library reconnects, but doesn't then follow up with our data request.*/
-static const uint32_t ESPMHP_POLL_INTERVAL_DEFAULT = 2000; // in milliseconds,
+static const uint32_t ESPMHP_POLL_INTERVAL_DEFAULT = 500; // in milliseconds,
                                                            // 0 < X <= 9000
 static const uint8_t ESPMHP_MIN_TEMPERATURE = 16; // degrees C,
                                                   // defined by hardware