diff --git a/plugins/importer.java b/plugins/importer.java
index 01fbc67..98374fd 100644
--- a/plugins/importer.java
+++ b/plugins/importer.java
@@ -274,8 +274,8 @@ public class importer implements Plugin {
                                     } else {
                                         String start = "init_field=" + tokens[4] + ", ";
                                         String end = "final_field=" + tokens[5] + ", ";
-                                        String ramp = "ramp_speed=" + tokens[6] + ", ";
-                                        sb.append(ident).append("hyst_step(").append(forward).append(field).append(start).append(end).append(ramp).append(energies).append(")\n");
+                                        String step = "step=" + tokens[6] + ", ";
+                                        sb.append(ident).append("hyst_step(").append(forward).append(field).append(start).append(end).append(step).append(energies).append(")\n");
                                     }
                                     break;
                                 default:
diff --git a/script/local.py b/script/local.py
index ec11e8b..0d4e904 100644
--- a/script/local.py
+++ b/script/local.py
@@ -285,19 +285,20 @@ def hyst_cont(field, init_field, final_field, ramp_speed, energies):
 def hyst_cont_mult(field, ranges, energies):
     run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "MODE":None, "OFFSET":None})
 
-def hyst_step(forward, field,  init_field, final_field, ramp_speed, energies):
-    pass
+def hyst_step(forward, field,  init_field, final_field, step, energies):
+    run("HistScanMult",{"FIELD":field, "RANGES":[(init_field, final_field, step),], "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None})
 
 def hyst_step_mult(forward, ranges, ramp_speed, energies):
-    pass
+    run("HistScanMult",{"FIELD":field, "RANGES":ranges, "ENERGIES":energies, "ENERGY_CHANGE_SLEEP":0.5, "FIELD_CHANGE_SLEEP":22.0, "MODE":None, "OFFSET":None})
 
 def scan_e(start, end, step):
-    setpoint = Channel (energy, 'd')
-    readback = Channel (keithleys[keithley][2], 'd')
-    lscan(setpoint, readback, float(start), float(end), float(step), latency = 0.1)
+    setpoint = Channel (energy.channelName, 'd') #Not using energy device to have a blocking write
+    wait_beam()
+    lscan(setpoint, energy_readback, float(start), float(end), float(step))
 
 def scan_e(ranges):
-    pass        
+    setpoint = Channel (energy.channelName, 'd')
+    rscan(setpoint, energy_readback, ranges)
 
 def scan_v(keithley,start, end, step):
     setpoint = Channel (keithleys[keithley][0], 'd')