diff --git a/config/energy_scan.properties b/config/energy_scan.properties
index 9a76c86..d2f5c6c 100644
--- a/config/energy_scan.properties
+++ b/config/energy_scan.properties
@@ -2,3 +2,4 @@ Fe=690.0;755.0;2.0;10.0;0.0;2.0;2.0;2.0
 Ti=400.0;475.0;2.0;10.0;0.0;2.0;2.0;2.0
 Er=1380.0;1470.0;3.0;10.0;-11.0;-5.5;4.0;4.0
 Ta=1700.0;1820.0;3.0;10.0;-11.0;-5.5;4.0;4.0
+Fe 123=0.0;0.0;0.0;0.0;0.0;0.0;0.0;0.0
diff --git a/plugins/EnergyScan.java b/plugins/EnergyScan.java
index 08fdba2..b6246a4 100644
--- a/plugins/EnergyScan.java
+++ b/plugins/EnergyScan.java
@@ -20,7 +20,7 @@ import ch.psi.utils.swing.Editor.EditorDialog;
 import ch.psi.pshell.core.Controller.ControllerStateException;
 import ch.psi.pshell.data.PlotDescriptor;
 import ch.psi.pshell.device.Device;
-import ch.psi.pshell.device.DeviceListener;
+import ch.psi.pshell.device.DeviceAdapter;
 import ch.psi.pshell.epics.ChannelDoubleArray;
 import ch.psi.pshell.epics.ChannelInteger;
 import ch.psi.pshell.plot.LinePlot;
@@ -64,11 +64,7 @@ public class EnergyScan extends Panel {
         idata = (ChannelDoubleArray) getController().getDevicePool().getByName("idata");
         fdata = (ChannelDoubleArray) getController().getDevicePool().getByName("fdata");
 
-        getController().getDevicePool().getByName("count").addListener(new DeviceListener() {
-            @Override
-            public void onStateChanged(Device device, State state, State former) {
-            }
-
+        getController().getDevicePool().getByName("count").addListener(new DeviceAdapter() {
             @Override
             public void onValueChanged(Device device, Object value, Object former) {
                 update();
@@ -284,7 +280,7 @@ public class EnergyScan extends Panel {
         prop.load(new FileInputStream(getConfigFile().toFile()));
         String selection = comboSetup.getSelectedItem().toString();
         String val = prop.getProperty(selection);
-        String[] tokens = val.split(" ");
+        String[] tokens = val.split(";");
         if (tokens.length != 8) {
             throw new Exception("Invalid file format");
         }