diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java
index 1ab4f61..4ae83d1 100644
--- a/plugins/EnergyScan.java
+++ b/plugins/EnergyScan.java
@@ -26,8 +26,6 @@ public class EnergyScan extends Panel {
     ChannelDoubleArray data;
     ChannelDoubleArray edata;
     ChannelInteger count;
-
-    volatile boolean requestedPlotting;
     @Override
     protected JPanel create() {
         panel = new PluginPanel();
@@ -35,7 +33,7 @@ public class EnergyScan extends Panel {
     }
 
     @Override
-    protected void onInitialize() {
+    protected void onInitialize(int runCount) {
         super.onInitialize();
         
         count = (ChannelInteger) getController().getDevicePool().getByName("count");
@@ -49,17 +47,18 @@ public class EnergyScan extends Panel {
 
             @Override
             public void onValueChanged(Device device, Object value, Object former) {
-                if (!requestedPlotting){
-                    requestedPlotting = true;
-                    SwingUtilities.invokeLater(() -> {
-                        panel.plot();
-                    });                    
-                }                
+                update();            
             }
         });
+        update();
+    }
+
+    @Override
+    protected void doUpdate() {
         panel.plot();
     }
 
+
     public class PluginPanel extends MonitoredPanel {
 
         final LinePlotBase plot;