diff --git a/platformio.ini b/platformio.ini
index c5204f8..5d21a24 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -12,6 +12,6 @@
 platform = espressif32
 board = wt32-eth01
 framework = arduino
-lib_deps = siwats/ESPMegaPROR3@^2.9.3
+lib_deps = siwats/ESPMegaPROR3@^2.9.4
 monitor_speed = 115200
-build_flags = -DCORE_DEBUG_LEVEL=0 -DSW_VERSION='"ise-final-1.0"' -DBOARD_MODEL='"ESPMegaPRO R3.3b"'
\ No newline at end of file
+build_flags = -DCORE_DEBUG_LEVEL=0 -DSW_VERSION='"ise-final-1.3"' -DBOARD_MODEL='"ESPMegaPRO R3.3b"'
\ No newline at end of file
diff --git a/src/main.cpp b/src/main.cpp
index d2e6524..fc54fcd 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -172,41 +172,6 @@ void setup()
   climateCard_daikin.setFRAMAutoSave(true);
   espmega.display->bindClimateCard(&climateCard_daikin);
 
-// Current Transformers
-#ifdef ANALOG_ENABLE
-  espmega.installCard(4, &analogCard);
-  espmega.installCard(5, &ct1);
-  ct1.bindFRAM(&espmega.fram, 6000);
-  ct1.loadEnergy();
-  ct1.setEnergyAutoSave(true);
-  espmega.iot->registerCard(5);
-  espmega.installCard(6, &ct2);
-  ct2.bindFRAM(&espmega.fram, 6100);
-  ct2.loadEnergy();
-  ct2.setEnergyAutoSave(true);
-  espmega.iot->registerCard(6);
-  espmega.installCard(7, &ct3);
-  ct3.bindFRAM(&espmega.fram, 6200);
-  ct3.loadEnergy();
-  ct3.setEnergyAutoSave(true);
-  espmega.iot->registerCard(7);
-  espmega.installCard(8, &ct4);
-  ct4.bindFRAM(&espmega.fram, 6300);
-  ct4.loadEnergy();
-  ct4.setEnergyAutoSave(true);
-  espmega.iot->registerCard(8);
-  espmega.installCard(9, &ct5);
-  ct5.bindFRAM(&espmega.fram, 6400);
-  ct5.loadEnergy();
-  ct5.setEnergyAutoSave(true);
-  espmega.iot->registerCard(9);
-  espmega.installCard(10, &ct6);
-  ct6.bindFRAM(&espmega.fram, 6500);
-  ct6.loadEnergy();
-  ct6.setEnergyAutoSave(true);
-  espmega.iot->registerCard(10);
-#endif
-
 // Input callbacks
 // pre-load the input buffers
   ESP_LOGV("ISE IoT OS", "Pre-loading input buffers");
@@ -246,16 +211,28 @@ void setup()
     ESP_LOGV("ISE OS", "Analog card available, installing current transformer cards");
     espmega.installCard(5, &ct1);
     ct1.bindFRAM(&espmega.fram, 5010);
+    ct1.loadEnergy();
+    ct1.setEnergyAutoSave(true);
     espmega.installCard(6, &ct2);
     ct2.bindFRAM(&espmega.fram, 5020);
+    ct2.loadEnergy();
+    ct2.setEnergyAutoSave(true);
     espmega.installCard(7, &ct3);
     ct3.bindFRAM(&espmega.fram, 5030);
+    ct3.loadEnergy();
+    ct3.setEnergyAutoSave(true);
     espmega.installCard(8, &ct4);
     ct4.bindFRAM(&espmega.fram, 5040);
+    ct4.loadEnergy();
+    ct4.setEnergyAutoSave(true);
     espmega.installCard(9, &ct5);
     ct5.bindFRAM(&espmega.fram, 5050);
+    ct5.loadEnergy();
+    ct5.setEnergyAutoSave(true);
     espmega.installCard(10, &ct5);
     ct6.bindFRAM(&espmega.fram, 5060);
+    ct6.loadEnergy();
+    ct6.setEnergyAutoSave(true);
     espmega.iot->registerCard(5);
     espmega.iot->registerCard(6);
     espmega.iot->registerCard(7);