diff --git a/build/lib/iexcode/init_Kapp.py b/build/lib/iexcode/init_Kapp.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2e8127267a9a74802b1bda965a2878886434e93
--- /dev/null
+++ b/build/lib/iexcode/init_Kapp.py
@@ -0,0 +1,11 @@
+
+from iexcode.instruments.Kappa import * 
+from iexcode.instruments.Kappa_det import * 
+from iexcode.instruments.Kappa_Euler import * 
+
+from iexcode.instruments.current_amplifiers import * 
+from iexcode.instruments.MPA import * 
+from iexcode.instruments.vortexs29 import * 
+
+
+from iexcode.instruments.spec_stuff import * 
diff --git a/build/lib/iexcode/init_staff.py b/build/lib/iexcode/init_staff.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ea17bb7dde161ba943a77873cc9e1078ace74f1
--- /dev/null
+++ b/build/lib/iexcode/init_staff.py
@@ -0,0 +1 @@
+from iexcode.instruments.staff import * 
diff --git a/build/lib/iexcode/init_xrays.py b/build/lib/iexcode/init_xrays.py
new file mode 100644
index 0000000000000000000000000000000000000000..ed42729f9b6aed1143e73352afd037b7d3ac6a4d
--- /dev/null
+++ b/build/lib/iexcode/init_xrays.py
@@ -0,0 +1,12 @@
+from iexcode.instruments.beamline import * 
+from iexcode.instruments.diagnostics import * 
+from iexcode.instruments.FMB_mirrors import * 
+from iexcode.instruments.gate_valves import * 
+from iexcode.instruments.hxp_mirrors import * 
+from iexcode.instruments.IEX_VPU import * 
+from iexcode.instruments.m3r import * 
+from iexcode.instruments.slits import * 
+from iexcode.instruments.resolution import * 
+from iexcode.instruments.storage_ring import * 
+from iexcode.instruments.VLS_PGM import * 
+from iexcode.instruments.xrays import * 
\ No newline at end of file
diff --git a/build/lib/iexcode/instruments/ARPES.py b/build/lib/iexcode/instruments/ARPES.py
index a2337c0b13b2a5f7dab34c46b4e977b5949c31b9..68b161c9059860f03ccad6d511fbe6c993483c9c 100644
--- a/build/lib/iexcode/instruments/ARPES.py
+++ b/build/lib/iexcode/instruments/ARPES.py
@@ -24,8 +24,11 @@ from iexcode.instruments.shutters import branch_shutter_close
 from iexcode.instruments.slits import slit3C_get
 
 from iexcode.instruments.Lakeshore_335 import Lakeshore_reset
-from iexcode.instruments.electron_analyzer import folders_EA,EA
+from iexcode.instruments.electron_analyzer import EA_init_Motors, folders_EA,EA
 
+global BL
+global tey,ca15
+global ARPES_Motors
 
 #############################################################################
 def ARPES_init(set_folders=True,reset=True,**kwargs):
@@ -47,18 +50,17 @@ def ARPES_init(set_folders=True,reset=True,**kwargs):
     ARPES_trigger_dictionary(),ARPES_scan_before_sequence(),ARPES_scan_after_sequence())
 
     #endstation
-    global BL
     BL=Endstation('ARPES',kwargs['scan_ioc'],kwargs['xrays'],kwargs['BL_mode'],mda_scanRecord,
     ARPES_log_header,ARPES_log_entries,ARPES_motor_dictionary)
 
     #EA
     try: 
         EA.get()
+        EA_init_Motors(ARPES_Motors)
     except:
         print("\n\n NOTE: Scienta IOC is not running - start IOC and %run Macros_29id/ScanFunctions_EA.py\n\n")
     
     #global detectors
-    global tey,ca15
     tey = Keithley('c',1)
     ca15 = Keithley('b',15)
 
@@ -75,7 +77,6 @@ def ARPES_init(set_folders=True,reset=True,**kwargs):
         ARPES_reset()
 
     #motors
-    global ARPES_Motors
     physical_motors = ['x','y','z','th','chi','phi']
     psuedo_motors = ['focus']
     ARPES_Motors = Motors('ARPES',ARPES_motor_dictionary(),physical_motors,psuedo_motors)
diff --git a/build/lib/iexcode/instruments/Kappa.py b/build/lib/iexcode/instruments/Kappa.py
index f819d120bfac2c2cfac529fd1ae4067a722118d9..dda262f11b213a432d60fef4f9f1486ea45d6847 100644
--- a/build/lib/iexcode/instruments/Kappa.py
+++ b/build/lib/iexcode/instruments/Kappa.py
@@ -282,7 +282,7 @@ def Kappa_reset():
     
     #resetting mono and anyother beamline stuff
     if BL.xrays:
-        JLM="xrays_reset()"
+        xrays_reset()
 
     #reseting the Kappa Lakeshore
 
@@ -324,7 +324,7 @@ def Kappa_get_all(verbose=True):
 
     #beamline info
     if BL.xray:
-        JLM="beamline_info = xrays_get_all()"
+        beamline_info = xrays_get_all()
         #vals.update(beamline_info) 
 
     mesh.get()
diff --git a/build/lib/iexcode/instruments/Scienta.py b/build/lib/iexcode/instruments/Scienta.py
index f493664c17207aa84874be71aee4433e459c25f8..e49856e0bf80ce8ca05e757546d273b3e58b9f72 100644
--- a/build/lib/iexcode/instruments/Scienta.py
+++ b/build/lib/iexcode/instruments/Scienta.py
@@ -80,7 +80,11 @@ class Scienta:
         #Camera Settings
         self.Frames = None
         
-        self.get()
+        pv = PV(self.PHV+"WorkFunction")
+        if pv.connect():
+            self.get()
+        else:
+            print("Scienta is not connected")
         return  
 
     def get(self,q=1):
@@ -88,6 +92,7 @@ class Scienta:
         Gets the current Scienta parameters
         returns the dictionary for q!=1
         """
+
         for key in vars(self):
             if key not in ["PHV","_Pcam","_savePlugin","_statsPlugin","wk","Frames","dtype"]:
                 vars(self)[key]=caget(self.PHV+key+".VAL")
@@ -100,7 +105,6 @@ class Scienta:
         if q !=1:
             for key in vars(self):
                 print(key+" = "+str(vars(self)[key]))
-
         return vars(self)
 
     def counts(self):
diff --git a/build/lib/iexcode/instruments/__init__.py b/build/lib/iexcode/instruments/__init__.py
index e244a3c105e5bc09da608c5fd6134ba1ef425528..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/build/lib/iexcode/instruments/__init__.py
+++ b/build/lib/iexcode/instruments/__init__.py
@@ -1,42 +0,0 @@
-
-""" from iexcode.instruments.AD_utilites import *
-from iexcode.instruments.ARPES import *
-from iexcode.instruments.bakeout import * 
-from iexcode.instruments.beamline import * 
-from iexcode.instruments.cameras import * 
-from iexcode.instruments.conversions_constants import * 
-from iexcode.instruments.current_amplifiers import * 
-from iexcode.instruments.diagnostics import * 
-from iexcode.instruments.electron_analyzer import * 
-from iexcode.instruments.encoders import * 
-from iexcode.instruments.files_and_folders import * 
-from iexcode.instruments.FMB_mirrors import * 
-from iexcode.instruments.gate_valves import * 
-from iexcode.instruments.hxp_mirrors import * 
-from iexcode.instruments.IEX_endstations import * 
-from iexcode.instruments.IEX_VPU import * 
-from iexcode.instruments.Kappa import * 
-from iexcode.instruments.Kappa_det import * 
-from iexcode.instruments.Kappa_Euler import * 
-from iexcode.instruments.Lakeshore_335 import * 
-from iexcode.instruments.logfile import * 
-from iexcode.instruments.m3r import * 
-from iexcode.instruments.Motors import * 
-from iexcode.instruments.mpa import * 
-from iexcode.instruments.remote_controlers import * 
-from iexcode.instruments.resolution import * 
-from iexcode.instruments.s29_temp_cntl import * 
-from iexcode.instruments.scalers import * 
-from iexcode.instruments.Scienta import * 
-from iexcode.instruments.shutters import * 
-from iexcode.instruments.slits import * 
-from iexcode.instruments.spec_stuff import * 
-from iexcode.instruments.staff import * 
-from iexcode.instruments.storage_ring import * 
-from iexcode.instruments.userCalcs import * 
-from iexcode.instruments.utilities import * 
-from iexcode.instruments.VLS_PGM import * 
-from iexcode.instruments.vortexs29 import * 
-from iexcode.instruments.xrays import * 
-
- """
diff --git a/build/lib/iexcode/instruments/electron_analyzer.py b/build/lib/iexcode/instruments/electron_analyzer.py
index 119d7586295ed0fb92d964439e10c8b06693ebf3..3c208d0aba3a14068fcfbb5cf379fa8a567a438b 100644
--- a/build/lib/iexcode/instruments/electron_analyzer.py
+++ b/build/lib/iexcode/instruments/electron_analyzer.py
@@ -22,13 +22,21 @@ from iexcode.instruments.shutters import branch_shutter_close
 from iexcode.instruments.VLS_PGM import mono_energy_get
 from iexcode.instruments.files_and_folders import get_next_fileNumber
 from iexcode.instruments.logfile import *
-from iexcode.instruments.ARPES import ARPES_Motors
 from iexcode.instruments.Scienta import *
 
 global EA
-EA = Scienta()
+try:
+    print('connecting to Scienta')
+    EA = Scienta()
+except:
+    print("EA is not connected")
 
 ###########################################################################
+def EA_init_Motors(Motors):
+    """
+    Adds Motors to EA object to be used in scanning
+    """
+    EA.Motors = Motors
 
 def EA_ioc_init(**kwargs):
     """
@@ -443,10 +451,10 @@ def scanFM(RoughPositions,thList,EAlist,**kwargs):
     if kwargs['debug']:
         print(x,y,z,th,chi,phi)
     
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("th")[1],ARPES_Motors._motor_dictionary("th")[0],th,positioner_num=1)
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("x")[1],ARPES_Motors._motor_dictionary("x")[0],x,positioner_num=2)
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("y")[1],ARPES_Motors._motor_dictionary("y")[0],y,positioner_num=3)
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("z")[1],ARPES_Motors._motor_dictionary("z")[0],z,positioner_num=4)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("th")[1],EA.Motors._motor_dictionary("th")[0],th,positioner_num=1)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("x")[1],EA.Motors._motor_dictionary("x")[0],x,positioner_num=2)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("y")[1],EA.Motors._motor_dictionary("y")[0],y,positioner_num=3)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("z")[1],EA.Motors._motor_dictionary("z")[0],z,positioner_num=4)
 
     #setting up EA
     EAkwargs={
@@ -518,7 +526,7 @@ def mvth_interp(RoughPositions, thVal,**kwargs):
     x,y,z,th,chi,phi=interpRoughPositions(RoughPositions,thVal,thVal-.1,1,**kwargs)
     Pos=[x[0],y[0],z[0],th[0],chi[0],phi[0]]
     #print("Pos = ",Pos)
-    ARPES_Motors.mvsample(Pos)
+    EA.Motors.mvsample(Pos)
 
 def scanEA_hv(hv_start_stop_step_lists,EAlist=[],**kwargs):    
     """
@@ -615,7 +623,7 @@ def scanEA_motor(EAlist, motor,start,stop,step,mode='absolute',**kwargs):
     scan_dim=2 #hard coded
     kwargs.update({'scan_dim':scan_dim})
 
-    ARPES_Motors.scan(motor,start,stop,step,**kwargs)
+    EA.Motors.scan(motor,start,stop,step,**kwargs)
     
     if kwargs['debug']:
         print("ScanGo scan_dim = ",scan_dim)
@@ -662,7 +670,7 @@ def scanEA_Mesh(EAlist,y_start_stop_step,z_start_stop_step,**kwargs):
     outer_scan_dim=3 #hard coded 
     inner_loop_list = y_start_stop_step.insert(0,"y")
     outer_loop_list = z_start_stop_step.insert(0,"z")
-    ARPES_Motors.scan_2D(inner_loop_list,outer_loop_list,outer_scan_dim,**kwargs)
+    EA.Motors.scan_2D(inner_loop_list,outer_loop_list,outer_scan_dim,**kwargs)
     
     if kwargs['debug']:
         print("ScanGo scan_dim = ",outer_scan_dim)
diff --git a/build/lib/iexcode/instruments/xrays.py b/build/lib/iexcode/instruments/xrays.py
index b4a4c1883e8164297706e38a2faefeafd0047e07..23b2ddc3a367032cd8114354ccd50a6b766ffd1b 100644
--- a/build/lib/iexcode/instruments/xrays.py
+++ b/build/lib/iexcode/instruments/xrays.py
@@ -20,7 +20,7 @@ from iexcode.instruments.utilities import print_warning_message,make_table, take
 from iexcode.instruments.current_amplifiers import ca_average
 from iexcode.instruments.beamline import endstation_cams_enable
 
-from iexcode.instruments.MPA import mpa_HV_on,mpa_HV_off
+from iexcode.instruments.MPA import MPA
 
 
 ##############################################################################################################
diff --git a/build/lib/iexcode/macros/__init__.py b/build/lib/iexcode/macros/__init__.py
index 8b137891791fe96927ad78e64b0aad7bded08bdc..d2a66a14d237e6ff8467fe93e859aa4c9aeac418 100644
--- a/build/lib/iexcode/macros/__init__.py
+++ b/build/lib/iexcode/macros/__init__.py
@@ -1 +1,17 @@
 
+from iexcode.instruments.AD_utilities import *
+from iexcode.instruments.bakeout import * 
+from iexcode.instruments.cameras import * 
+from iexcode.instruments.conversions_constants import * 
+from iexcode.instruments.encoders import * 
+from iexcode.instruments.files_and_folders import * 
+from iexcode.instruments.IEX_endstations import * 
+from iexcode.instruments.logfile import * 
+from iexcode.instruments.Motors import * 
+from iexcode.instruments.remote_controlers import * 
+from iexcode.instruments.s29_temp_cntl import * 
+from iexcode.instruments.scalers import * 
+from iexcode.instruments.userCalcs import * 
+from iexcode.instruments.utilities import * 
+
+
diff --git a/iexcode.egg-info/SOURCES.txt b/iexcode.egg-info/SOURCES.txt
index 4b38e09f7e8b8e374fd86d99b4ed8654170a0561..ace7681e8e11ac0f52282495fdc477fe006f8091 100644
--- a/iexcode.egg-info/SOURCES.txt
+++ b/iexcode.egg-info/SOURCES.txt
@@ -1,6 +1,9 @@
 README.md
 setup.py
 iexcode/__init__.py
+iexcode/init_Kapp.py
+iexcode/init_staff.py
+iexcode/init_xrays.py
 iexcode.egg-info/PKG-INFO
 iexcode.egg-info/SOURCES.txt
 iexcode.egg-info/dependency_links.txt
diff --git a/iexcode/init_ARPES b/iexcode/init_ARPES
new file mode 100644
index 0000000000000000000000000000000000000000..060e72498cabb66d0d63f35c4e23eef764c55af7
--- /dev/null
+++ b/iexcode/init_ARPES
@@ -0,0 +1,7 @@
+from iexcode.instruments.ARPES import *
+from iexcode.instruments.electron_analyzer import * 
+#from iexcode.instruments.Scienta import * 
+
+
+from iexcode.instruments.current_amplifiers import * 
+from iexcode.instruments.Lakeshore_335 import * 
diff --git a/iexcode/init_Kapp.py b/iexcode/init_Kapp.py
new file mode 100644
index 0000000000000000000000000000000000000000..d2e8127267a9a74802b1bda965a2878886434e93
--- /dev/null
+++ b/iexcode/init_Kapp.py
@@ -0,0 +1,11 @@
+
+from iexcode.instruments.Kappa import * 
+from iexcode.instruments.Kappa_det import * 
+from iexcode.instruments.Kappa_Euler import * 
+
+from iexcode.instruments.current_amplifiers import * 
+from iexcode.instruments.MPA import * 
+from iexcode.instruments.vortexs29 import * 
+
+
+from iexcode.instruments.spec_stuff import * 
diff --git a/iexcode/init_staff.py b/iexcode/init_staff.py
new file mode 100644
index 0000000000000000000000000000000000000000..7ea17bb7dde161ba943a77873cc9e1078ace74f1
--- /dev/null
+++ b/iexcode/init_staff.py
@@ -0,0 +1 @@
+from iexcode.instruments.staff import * 
diff --git a/iexcode/init_xrays.py b/iexcode/init_xrays.py
new file mode 100644
index 0000000000000000000000000000000000000000..ed42729f9b6aed1143e73352afd037b7d3ac6a4d
--- /dev/null
+++ b/iexcode/init_xrays.py
@@ -0,0 +1,12 @@
+from iexcode.instruments.beamline import * 
+from iexcode.instruments.diagnostics import * 
+from iexcode.instruments.FMB_mirrors import * 
+from iexcode.instruments.gate_valves import * 
+from iexcode.instruments.hxp_mirrors import * 
+from iexcode.instruments.IEX_VPU import * 
+from iexcode.instruments.m3r import * 
+from iexcode.instruments.slits import * 
+from iexcode.instruments.resolution import * 
+from iexcode.instruments.storage_ring import * 
+from iexcode.instruments.VLS_PGM import * 
+from iexcode.instruments.xrays import * 
\ No newline at end of file
diff --git a/iexcode/instruments/ARPES.py b/iexcode/instruments/ARPES.py
index a2337c0b13b2a5f7dab34c46b4e977b5949c31b9..68b161c9059860f03ccad6d511fbe6c993483c9c 100644
--- a/iexcode/instruments/ARPES.py
+++ b/iexcode/instruments/ARPES.py
@@ -24,8 +24,11 @@ from iexcode.instruments.shutters import branch_shutter_close
 from iexcode.instruments.slits import slit3C_get
 
 from iexcode.instruments.Lakeshore_335 import Lakeshore_reset
-from iexcode.instruments.electron_analyzer import folders_EA,EA
+from iexcode.instruments.electron_analyzer import EA_init_Motors, folders_EA,EA
 
+global BL
+global tey,ca15
+global ARPES_Motors
 
 #############################################################################
 def ARPES_init(set_folders=True,reset=True,**kwargs):
@@ -47,18 +50,17 @@ def ARPES_init(set_folders=True,reset=True,**kwargs):
     ARPES_trigger_dictionary(),ARPES_scan_before_sequence(),ARPES_scan_after_sequence())
 
     #endstation
-    global BL
     BL=Endstation('ARPES',kwargs['scan_ioc'],kwargs['xrays'],kwargs['BL_mode'],mda_scanRecord,
     ARPES_log_header,ARPES_log_entries,ARPES_motor_dictionary)
 
     #EA
     try: 
         EA.get()
+        EA_init_Motors(ARPES_Motors)
     except:
         print("\n\n NOTE: Scienta IOC is not running - start IOC and %run Macros_29id/ScanFunctions_EA.py\n\n")
     
     #global detectors
-    global tey,ca15
     tey = Keithley('c',1)
     ca15 = Keithley('b',15)
 
@@ -75,7 +77,6 @@ def ARPES_init(set_folders=True,reset=True,**kwargs):
         ARPES_reset()
 
     #motors
-    global ARPES_Motors
     physical_motors = ['x','y','z','th','chi','phi']
     psuedo_motors = ['focus']
     ARPES_Motors = Motors('ARPES',ARPES_motor_dictionary(),physical_motors,psuedo_motors)
diff --git a/iexcode/instruments/Kappa.py b/iexcode/instruments/Kappa.py
index f819d120bfac2c2cfac529fd1ae4067a722118d9..dda262f11b213a432d60fef4f9f1486ea45d6847 100644
--- a/iexcode/instruments/Kappa.py
+++ b/iexcode/instruments/Kappa.py
@@ -282,7 +282,7 @@ def Kappa_reset():
     
     #resetting mono and anyother beamline stuff
     if BL.xrays:
-        JLM="xrays_reset()"
+        xrays_reset()
 
     #reseting the Kappa Lakeshore
 
@@ -324,7 +324,7 @@ def Kappa_get_all(verbose=True):
 
     #beamline info
     if BL.xray:
-        JLM="beamline_info = xrays_get_all()"
+        beamline_info = xrays_get_all()
         #vals.update(beamline_info) 
 
     mesh.get()
diff --git a/iexcode/instruments/Scienta.py b/iexcode/instruments/Scienta.py
index f493664c17207aa84874be71aee4433e459c25f8..e49856e0bf80ce8ca05e757546d273b3e58b9f72 100644
--- a/iexcode/instruments/Scienta.py
+++ b/iexcode/instruments/Scienta.py
@@ -80,7 +80,11 @@ class Scienta:
         #Camera Settings
         self.Frames = None
         
-        self.get()
+        pv = PV(self.PHV+"WorkFunction")
+        if pv.connect():
+            self.get()
+        else:
+            print("Scienta is not connected")
         return  
 
     def get(self,q=1):
@@ -88,6 +92,7 @@ class Scienta:
         Gets the current Scienta parameters
         returns the dictionary for q!=1
         """
+
         for key in vars(self):
             if key not in ["PHV","_Pcam","_savePlugin","_statsPlugin","wk","Frames","dtype"]:
                 vars(self)[key]=caget(self.PHV+key+".VAL")
@@ -100,7 +105,6 @@ class Scienta:
         if q !=1:
             for key in vars(self):
                 print(key+" = "+str(vars(self)[key]))
-
         return vars(self)
 
     def counts(self):
diff --git a/iexcode/instruments/__init__.py b/iexcode/instruments/__init__.py
index e244a3c105e5bc09da608c5fd6134ba1ef425528..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644
--- a/iexcode/instruments/__init__.py
+++ b/iexcode/instruments/__init__.py
@@ -1,42 +0,0 @@
-
-""" from iexcode.instruments.AD_utilites import *
-from iexcode.instruments.ARPES import *
-from iexcode.instruments.bakeout import * 
-from iexcode.instruments.beamline import * 
-from iexcode.instruments.cameras import * 
-from iexcode.instruments.conversions_constants import * 
-from iexcode.instruments.current_amplifiers import * 
-from iexcode.instruments.diagnostics import * 
-from iexcode.instruments.electron_analyzer import * 
-from iexcode.instruments.encoders import * 
-from iexcode.instruments.files_and_folders import * 
-from iexcode.instruments.FMB_mirrors import * 
-from iexcode.instruments.gate_valves import * 
-from iexcode.instruments.hxp_mirrors import * 
-from iexcode.instruments.IEX_endstations import * 
-from iexcode.instruments.IEX_VPU import * 
-from iexcode.instruments.Kappa import * 
-from iexcode.instruments.Kappa_det import * 
-from iexcode.instruments.Kappa_Euler import * 
-from iexcode.instruments.Lakeshore_335 import * 
-from iexcode.instruments.logfile import * 
-from iexcode.instruments.m3r import * 
-from iexcode.instruments.Motors import * 
-from iexcode.instruments.mpa import * 
-from iexcode.instruments.remote_controlers import * 
-from iexcode.instruments.resolution import * 
-from iexcode.instruments.s29_temp_cntl import * 
-from iexcode.instruments.scalers import * 
-from iexcode.instruments.Scienta import * 
-from iexcode.instruments.shutters import * 
-from iexcode.instruments.slits import * 
-from iexcode.instruments.spec_stuff import * 
-from iexcode.instruments.staff import * 
-from iexcode.instruments.storage_ring import * 
-from iexcode.instruments.userCalcs import * 
-from iexcode.instruments.utilities import * 
-from iexcode.instruments.VLS_PGM import * 
-from iexcode.instruments.vortexs29 import * 
-from iexcode.instruments.xrays import * 
-
- """
diff --git a/iexcode/instruments/__pycache__/ARPES.cpython-37.pyc b/iexcode/instruments/__pycache__/ARPES.cpython-37.pyc
index 638823899b8a5742d22cc711aa7fbd24ab3aa5c6..75597a47c882b71d008e0bc4b04a61212dbc3b03 100644
Binary files a/iexcode/instruments/__pycache__/ARPES.cpython-37.pyc and b/iexcode/instruments/__pycache__/ARPES.cpython-37.pyc differ
diff --git a/iexcode/instruments/__pycache__/Kappa.cpython-37.pyc b/iexcode/instruments/__pycache__/Kappa.cpython-37.pyc
index 6a49022d4993b64ef4ab43a6b7172ca1fad232be..4cdb02de5338be6e406d459d6ab54bc1ffec6a31 100644
Binary files a/iexcode/instruments/__pycache__/Kappa.cpython-37.pyc and b/iexcode/instruments/__pycache__/Kappa.cpython-37.pyc differ
diff --git a/iexcode/instruments/__pycache__/Scienta.cpython-37.pyc b/iexcode/instruments/__pycache__/Scienta.cpython-37.pyc
index 9008e02435a9fc2c2c5df84e805f720754feb2a6..3749ba4d74f6697e31add388485ca2ac10d6c38c 100644
Binary files a/iexcode/instruments/__pycache__/Scienta.cpython-37.pyc and b/iexcode/instruments/__pycache__/Scienta.cpython-37.pyc differ
diff --git a/iexcode/instruments/__pycache__/bakeout.cpython-37.pyc b/iexcode/instruments/__pycache__/bakeout.cpython-37.pyc
index ed7fa33afb66085ab5615af80990bfae05fdd2fe..f66bfe8286efa29bc098861333f411d46e5eddd0 100644
Binary files a/iexcode/instruments/__pycache__/bakeout.cpython-37.pyc and b/iexcode/instruments/__pycache__/bakeout.cpython-37.pyc differ
diff --git a/iexcode/instruments/__pycache__/electron_analyzer.cpython-37.pyc b/iexcode/instruments/__pycache__/electron_analyzer.cpython-37.pyc
index 3ebdc4fd88753351e22ad01cdee9eb50dd7c3314..f9ca29030ddab11737767a189ff852583fe69d2c 100644
Binary files a/iexcode/instruments/__pycache__/electron_analyzer.cpython-37.pyc and b/iexcode/instruments/__pycache__/electron_analyzer.cpython-37.pyc differ
diff --git a/iexcode/instruments/__pycache__/xrays.cpython-37.pyc b/iexcode/instruments/__pycache__/xrays.cpython-37.pyc
index 914a5f624aecb4e6115c86b8777ed70d57dd766e..39194f37bc4eab31c1f8b35004e0612b2b371888 100644
Binary files a/iexcode/instruments/__pycache__/xrays.cpython-37.pyc and b/iexcode/instruments/__pycache__/xrays.cpython-37.pyc differ
diff --git a/iexcode/instruments/electron_analyzer.py b/iexcode/instruments/electron_analyzer.py
index 119d7586295ed0fb92d964439e10c8b06693ebf3..3c208d0aba3a14068fcfbb5cf379fa8a567a438b 100644
--- a/iexcode/instruments/electron_analyzer.py
+++ b/iexcode/instruments/electron_analyzer.py
@@ -22,13 +22,21 @@ from iexcode.instruments.shutters import branch_shutter_close
 from iexcode.instruments.VLS_PGM import mono_energy_get
 from iexcode.instruments.files_and_folders import get_next_fileNumber
 from iexcode.instruments.logfile import *
-from iexcode.instruments.ARPES import ARPES_Motors
 from iexcode.instruments.Scienta import *
 
 global EA
-EA = Scienta()
+try:
+    print('connecting to Scienta')
+    EA = Scienta()
+except:
+    print("EA is not connected")
 
 ###########################################################################
+def EA_init_Motors(Motors):
+    """
+    Adds Motors to EA object to be used in scanning
+    """
+    EA.Motors = Motors
 
 def EA_ioc_init(**kwargs):
     """
@@ -443,10 +451,10 @@ def scanFM(RoughPositions,thList,EAlist,**kwargs):
     if kwargs['debug']:
         print(x,y,z,th,chi,phi)
     
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("th")[1],ARPES_Motors._motor_dictionary("th")[0],th,positioner_num=1)
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("x")[1],ARPES_Motors._motor_dictionary("x")[0],x,positioner_num=2)
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("y")[1],ARPES_Motors._motor_dictionary("y")[0],y,positioner_num=3)
-    BL.mda.fillin_table(ARPES_Motors._motor_dictionary("z")[1],ARPES_Motors._motor_dictionary("z")[0],z,positioner_num=4)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("th")[1],EA.Motors._motor_dictionary("th")[0],th,positioner_num=1)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("x")[1],EA.Motors._motor_dictionary("x")[0],x,positioner_num=2)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("y")[1],EA.Motors._motor_dictionary("y")[0],y,positioner_num=3)
+    BL.mda.fillin_table(EA.Motors._motor_dictionary("z")[1],EA.Motors._motor_dictionary("z")[0],z,positioner_num=4)
 
     #setting up EA
     EAkwargs={
@@ -518,7 +526,7 @@ def mvth_interp(RoughPositions, thVal,**kwargs):
     x,y,z,th,chi,phi=interpRoughPositions(RoughPositions,thVal,thVal-.1,1,**kwargs)
     Pos=[x[0],y[0],z[0],th[0],chi[0],phi[0]]
     #print("Pos = ",Pos)
-    ARPES_Motors.mvsample(Pos)
+    EA.Motors.mvsample(Pos)
 
 def scanEA_hv(hv_start_stop_step_lists,EAlist=[],**kwargs):    
     """
@@ -615,7 +623,7 @@ def scanEA_motor(EAlist, motor,start,stop,step,mode='absolute',**kwargs):
     scan_dim=2 #hard coded
     kwargs.update({'scan_dim':scan_dim})
 
-    ARPES_Motors.scan(motor,start,stop,step,**kwargs)
+    EA.Motors.scan(motor,start,stop,step,**kwargs)
     
     if kwargs['debug']:
         print("ScanGo scan_dim = ",scan_dim)
@@ -662,7 +670,7 @@ def scanEA_Mesh(EAlist,y_start_stop_step,z_start_stop_step,**kwargs):
     outer_scan_dim=3 #hard coded 
     inner_loop_list = y_start_stop_step.insert(0,"y")
     outer_loop_list = z_start_stop_step.insert(0,"z")
-    ARPES_Motors.scan_2D(inner_loop_list,outer_loop_list,outer_scan_dim,**kwargs)
+    EA.Motors.scan_2D(inner_loop_list,outer_loop_list,outer_scan_dim,**kwargs)
     
     if kwargs['debug']:
         print("ScanGo scan_dim = ",outer_scan_dim)
diff --git a/iexcode/instruments/xrays.py b/iexcode/instruments/xrays.py
index b4a4c1883e8164297706e38a2faefeafd0047e07..23b2ddc3a367032cd8114354ccd50a6b766ffd1b 100644
--- a/iexcode/instruments/xrays.py
+++ b/iexcode/instruments/xrays.py
@@ -20,7 +20,7 @@ from iexcode.instruments.utilities import print_warning_message,make_table, take
 from iexcode.instruments.current_amplifiers import ca_average
 from iexcode.instruments.beamline import endstation_cams_enable
 
-from iexcode.instruments.MPA import mpa_HV_on,mpa_HV_off
+from iexcode.instruments.MPA import MPA
 
 
 ##############################################################################################################
diff --git a/iexcode/macros/__init__.py b/iexcode/macros/__init__.py
index 8b137891791fe96927ad78e64b0aad7bded08bdc..d2a66a14d237e6ff8467fe93e859aa4c9aeac418 100644
--- a/iexcode/macros/__init__.py
+++ b/iexcode/macros/__init__.py
@@ -1 +1,17 @@
 
+from iexcode.instruments.AD_utilities import *
+from iexcode.instruments.bakeout import * 
+from iexcode.instruments.cameras import * 
+from iexcode.instruments.conversions_constants import * 
+from iexcode.instruments.encoders import * 
+from iexcode.instruments.files_and_folders import * 
+from iexcode.instruments.IEX_endstations import * 
+from iexcode.instruments.logfile import * 
+from iexcode.instruments.Motors import * 
+from iexcode.instruments.remote_controlers import * 
+from iexcode.instruments.s29_temp_cntl import * 
+from iexcode.instruments.scalers import * 
+from iexcode.instruments.userCalcs import * 
+from iexcode.instruments.utilities import * 
+
+