diff --git a/pxiii_bec/device_configs/x06da_device_config.yaml b/pxiii_bec/device_configs/x06da_device_config.yaml
index 00c4f8b..74d2a1e 100644
--- a/pxiii_bec/device_configs/x06da_device_config.yaml
+++ b/pxiii_bec/device_configs/x06da_device_config.yaml
@@ -394,34 +394,15 @@ xbox_diode:
   readoutPriority: monitored
   readOnly: true
   softwareTrigger: false
-ms_focus:
-  description: Sample microscope focus
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-MS:FOCUS'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
 ms_zoom:
   description: Sample microscope zoom
   deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-MS:ZOOM'}
+  deviceConfig: {prefix: 'X06DA-ES-SAMCAM:ZOOM'}
   onFailure: buffer
   enabled: true
   readoutPriority: monitored
   readOnly: false
   softwareTrigger: false
-ms_try:
-  description: Sample microscope translation
-  deviceClass: ophyd.EpicsMotor
-  deviceConfig: {prefix: 'X06DA-ES-MS:TRY1'}
-  onFailure: buffer
-  enabled: true
-  readoutPriority: monitored
-  readOnly: false
-  softwareTrigger: false
-
 
 bstop_pneum:
   description: Beamstop pneumatic in-out
diff --git a/pxiii_bec/devices/A3200.py b/pxiii_bec/devices/A3200.py
index 44b1437..be02d1b 100644
--- a/pxiii_bec/devices/A3200.py
+++ b/pxiii_bec/devices/A3200.py
@@ -242,11 +242,12 @@ class AerotechAbrStage(Device):
         NOTE:  Original complete was raster scanner complete...
         """
         # Define wait until the busy flag goes down (excluding initial update)
-        def is_idle(*args, value, _, **kwargs):
+        def is_idle(*args, value, **kwargs):
             return bool(value==1)
 
         # Subscribe and wait for update
-        status = SubscriptionStatus(self.task1, is_idle, timeout=timeout, settle_time=0.5)
+        # status = SubscriptionStatus(self.task1, is_idle, timeout=timeout, settle_time=0.5)
+        status = SubscriptionStatus(self.raster_scan_done, is_idle, timeout=timeout, settle_time=0.5)
         return status
 
     def reset(self, settle_time=0.1):