diff --git a/config/plugins.properties b/config/plugins.properties
index f8765da..6b3dbd2 100644
--- a/config/plugins.properties
+++ b/config/plugins.properties
@@ -1,3 +1,4 @@
+WireScan.java=disabled
 SchottkyScan.java=disabled
 GunScan.java=disabled
 Correlation.java=disabled
diff --git a/devices/CurrentCamera.properties b/devices/CurrentCamera.properties
index 3846713..4eee42b 100644
--- a/devices/CurrentCamera.properties
+++ b/devices/CurrentCamera.properties
@@ -1,4 +1,4 @@
-#Wed Apr 12 14:57:03 CEST 2017
+#Wed Apr 12 16:02:36 CEST 2017
 colormap=Flame
 colormapAutomatic=false
 colormapMax=4000.0
diff --git a/plugins/GunScan.form b/plugins/GunScan.form
index faebcb9..59f1fe7 100644
--- a/plugins/GunScan.form
+++ b/plugins/GunScan.form
@@ -29,7 +29,7 @@
                       <EmptySpace min="-2" pref="34" max="-2" attributes="0"/>
                       <Component id="buttonAbort" min="-2" max="-2" attributes="0"/>
                   </Group>
-                  <Component id="jPanel1" max="32767" attributes="0"/>
+                  <Component id="panelPars" max="32767" attributes="0"/>
                   <Component id="jPanel2" alignment="0" max="32767" attributes="0"/>
               </Group>
               <EmptySpace max="-2" attributes="0"/>
@@ -45,7 +45,7 @@
               <Group type="103" groupAlignment="0" attributes="0">
                   <Component id="plot" pref="419" max="32767" attributes="0"/>
                   <Group type="102" attributes="0">
-                      <Component id="jPanel1" min="-2" max="-2" attributes="0"/>
+                      <Component id="panelPars" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="-2" attributes="0"/>
                       <Component id="jPanel2" min="-2" max="-2" attributes="0"/>
                       <EmptySpace max="32767" attributes="0"/>
@@ -61,7 +61,7 @@
     </DimensionLayout>
   </Layout>
   <SubComponents>
-    <Container class="javax.swing.JPanel" name="jPanel1">
+    <Container class="javax.swing.JPanel" name="panelPars">
       <Properties>
         <Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
           <Border info="org.netbeans.modules.form.compat2.border.TitledBorderInfo">
diff --git a/plugins/GunScan.java b/plugins/GunScan.java
index ccacbd0..e5ffd1b 100644
--- a/plugins/GunScan.java
+++ b/plugins/GunScan.java
@@ -13,13 +13,17 @@ import ch.psi.pshell.scan.ScanListener;
 import ch.psi.pshell.scan.ScanRecord;
 import ch.psi.pshell.ui.App;
 import ch.psi.pshell.ui.Panel;
+import ch.psi.pshell.ui.Plugin;
 import ch.psi.utils.State;
 import ch.psi.utils.swing.SwingUtils;
+import java.awt.Component;
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeoutException;
 import java.util.logging.Level;
 import java.util.logging.Logger;
+import javax.swing.JSpinner;
 
 /**
  *
@@ -39,11 +43,20 @@ public class GunScan extends Panel {
         plot.getAxis(Plot.AxisId.X).setLabel("Gun Phase");
         plot.getAxis(Plot.AxisId.Y).setLabel("MeV");
         plot.setLegendVisible(true);
+        setPersistedComponents(SwingUtils.getComponentsByType(panelPars, JSpinner.class));       
     }
 
     //Overridable callbacks
     @Override
     public void onInitialize(int runCount) {
+        try {
+            spinnerDispersion.setValue(Epics.get("SINBD01-DSCR010:DISPERSION-SIM", Double.class));
+            spinnerEnergy.setValue(Epics.get("SINBD01-DSCR010:ENERGY-SIM", Double.class));
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            showException(ex);
+        }
+        
     }
 
     @Override
@@ -70,18 +83,6 @@ public class GunScan extends Panel {
     public void onStart() {
         super.onStart();
         getContext().addScanListener(scanListener);
-        try {
-            if (App.isDetached()){
-                Epics.create();
-            }
-            spinnerDispersion.setValue(Epics.get("SINBD01-DSCR010:DISPERSION-SIM", Double.class));
-            spinnerEnergy.setValue(Epics.get("SINBD01-DSCR010:ENERGY-SIM", Double.class));
-            //spinnerDispersion.setValue(eval("caget('SINBD01-DSCR010:DISPERSION-SIM')", true));
-            //spinnerEnergy.setValue(eval("caget('SINBD01-DSCR010:ENERGY-SIM')", true));
-        } catch (Exception ex) {
-            ex.printStackTrace();
-            showException(ex);
-        }
     }
 
     @Override
@@ -128,7 +129,7 @@ public class GunScan extends Panel {
     // <editor-fold defaultstate="collapsed" desc="Generated Code">//GEN-BEGIN:initComponents
     private void initComponents() {
 
-        jPanel1 = new javax.swing.JPanel();
+        panelPars = new javax.swing.JPanel();
         startLabel = new javax.swing.JLabel();
         stopLabel = new javax.swing.JLabel();
         spinnerStep = new javax.swing.JSpinner();
@@ -150,7 +151,7 @@ public class GunScan extends Panel {
 
         setPreferredSize(new java.awt.Dimension(737, 445));
 
-        jPanel1.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Parameters"));
+        panelPars.setBorder(javax.swing.BorderFactory.createTitledBorder("Scan Parameters"));
 
         startLabel.setText("Start:");
 
@@ -178,56 +179,56 @@ public class GunScan extends Panel {
         spinnerStop.setMinimumSize(new java.awt.Dimension(53, 20));
         spinnerStop.setPreferredSize(new java.awt.Dimension(64, 20));
 
-        javax.swing.GroupLayout jPanel1Layout = new javax.swing.GroupLayout(jPanel1);
-        jPanel1.setLayout(jPanel1Layout);
-        jPanel1Layout.setHorizontalGroup(
-            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel1Layout.createSequentialGroup()
+        javax.swing.GroupLayout panelParsLayout = new javax.swing.GroupLayout(panelPars);
+        panelPars.setLayout(panelParsLayout);
+        panelParsLayout.setHorizontalGroup(
+            panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(panelParsLayout.createSequentialGroup()
                 .addContainerGap()
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
-                    .addGroup(jPanel1Layout.createSequentialGroup()
+                .addGroup(panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.TRAILING)
+                    .addGroup(panelParsLayout.createSequentialGroup()
                         .addComponent(latencyLabel)
                         .addGap(2, 2, 2)
                         .addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
+                    .addGroup(panelParsLayout.createSequentialGroup()
                         .addComponent(stopLabel)
                         .addGap(2, 2, 2)
                         .addComponent(spinnerStop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
+                    .addGroup(panelParsLayout.createSequentialGroup()
                         .addComponent(startLabel)
                         .addGap(2, 2, 2)
                         .addComponent(spinnerStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
+                    .addGroup(panelParsLayout.createSequentialGroup()
                         .addComponent(samplesLabel)
                         .addGap(2, 2, 2)
                         .addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE))
-                    .addGroup(jPanel1Layout.createSequentialGroup()
+                    .addGroup(panelParsLayout.createSequentialGroup()
                         .addComponent(stepLabel)
                         .addGap(2, 2, 2)
                         .addComponent(spinnerStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
         );
-        jPanel1Layout.setVerticalGroup(
-            jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
-            .addGroup(jPanel1Layout.createSequentialGroup()
+        panelParsLayout.setVerticalGroup(
+            panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
+            .addGroup(panelParsLayout.createSequentialGroup()
                 .addContainerGap()
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(spinnerStart, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(startLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(spinnerStop, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(stopLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(spinnerStep, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(stepLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(spinnerSamples, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(samplesLabel))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
-                .addGroup(jPanel1Layout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
+                .addGroup(panelParsLayout.createParallelGroup(javax.swing.GroupLayout.Alignment.BASELINE)
                     .addComponent(spinnerLatency, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                     .addComponent(latencyLabel))
                 .addContainerGap(javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
@@ -303,7 +304,7 @@ public class GunScan extends Panel {
                         .addComponent(buttonStart)
                         .addGap(34, 34, 34)
                         .addComponent(buttonAbort))
-                    .addComponent(jPanel1, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
+                    .addComponent(panelPars, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
                     .addComponent(jPanel2, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE))
                 .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                 .addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 531, Short.MAX_VALUE)
@@ -316,7 +317,7 @@ public class GunScan extends Panel {
                 .addGroup(layout.createParallelGroup(javax.swing.GroupLayout.Alignment.LEADING)
                     .addComponent(plot, javax.swing.GroupLayout.DEFAULT_SIZE, 419, Short.MAX_VALUE)
                     .addGroup(layout.createSequentialGroup()
-                        .addComponent(jPanel1, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
+                        .addComponent(panelPars, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED)
                         .addComponent(jPanel2, javax.swing.GroupLayout.PREFERRED_SIZE, javax.swing.GroupLayout.DEFAULT_SIZE, javax.swing.GroupLayout.PREFERRED_SIZE)
                         .addPreferredGap(javax.swing.LayoutStyle.ComponentPlacement.RELATED, javax.swing.GroupLayout.DEFAULT_SIZE, Short.MAX_VALUE)
@@ -326,7 +327,7 @@ public class GunScan extends Panel {
                 .addGap(14, 14, 14))
         );
 
-        jPanel1.getAccessibleContext().setAccessibleDescription("");
+        panelPars.getAccessibleContext().setAccessibleDescription("");
     }// </editor-fold>//GEN-END:initComponents
 
     private void buttonStartActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_buttonStartActionPerformed
@@ -367,9 +368,9 @@ public class GunScan extends Panel {
     private javax.swing.JButton buttonStart;
     private javax.swing.JLabel dispersionLabel;
     private javax.swing.JLabel energyLabel;
-    private javax.swing.JPanel jPanel1;
     private javax.swing.JPanel jPanel2;
     private javax.swing.JLabel latencyLabel;
+    private javax.swing.JPanel panelPars;
     private ch.psi.pshell.plot.LinePlotJFree plot;
     private javax.swing.JLabel samplesLabel;
     private javax.swing.JSpinner spinnerDispersion;