diff --git a/ophyd_devices/epics/devices/__init__.py b/ophyd_devices/epics/devices/__init__.py
index 7635a31..48ef839 100644
--- a/ophyd_devices/epics/devices/__init__.py
+++ b/ophyd_devices/epics/devices/__init__.py
@@ -5,6 +5,7 @@ from ophyd.sim import SynAxis, SynPeriodicSignal, SynSignal
 
 from .delay_generator_csaxs import DelayGeneratorcSAXS
 from .eiger9m_csaxs import Eiger9McSAXS
+from .grashopper_tomcat import GrashopperTOMCAT
 
 # cSAXS
 from .epics_motor_ex import EpicsMotorEx
diff --git a/ophyd_devices/epics/devices/grashopper_tomcat.py b/ophyd_devices/epics/devices/grashopper_tomcat.py
index d48a4c3..7bbd11f 100644
--- a/ophyd_devices/epics/devices/grashopper_tomcat.py
+++ b/ophyd_devices/epics/devices/grashopper_tomcat.py
@@ -6,8 +6,8 @@ import time as ttime
 # import numpy as np
 from ophyd.ophydobj import Kind
 
-os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "No"
-os.environ["EPICS_CA_ADDR_LIST"] = "129.129.208.143"
+# os.environ["EPICS_CA_AUTO_ADDR_LIST"] = "No"
+# os.environ["EPICS_CA_ADDR_LIST"] = "129.129.208.143"
 
 # from typing import Any
 from ophyd import EpicsSignal, EpicsSignalRO, EpicsSignalWithRBV
@@ -219,7 +219,7 @@ class GrashopperTOMCATSetup(CustomDetectorMixin):
         self.parent.image.set_array_counter.put(0)
         self.monitor_thread = None
         self.stop_monitor = False
-        self.run_monitor()
+        # self.run_monitor()
 
     def arm_acquisition(self) -> None:
         """Arm grashopper detector for acquisition"""
@@ -243,7 +243,9 @@ class GrashopperTOMCATSetup(CustomDetectorMixin):
     def on_trigger(self) -> None:
         """Trigger the detector"""
         if self.parent.cam.trigger_source.get() == TriggerSource.SOFTWARE:
-            self.parent.cam.software_trigger.put(1)
+            self.parent.cam.software_trigger_device.put(1)
+            ttime.sleep(0.1)
+            self.send_data()
 
     def run_monitor(self) -> None:
         """
@@ -356,7 +358,7 @@ class SLSDetectorCam(Device):
     trigger_source = ADCpt(EpicsSignalWithRBV, "TriggerSource", kind=Kind.config)
     trigger_delay = ADCpt(EpicsSignalWithRBV, "TriggerDelay", kind=Kind.omitted)
     exposure_mode = ADCpt(EpicsSignalWithRBV, "ExposureMode", kind=Kind.omitted)
-    software_trigger = ADCpt(EpicsSignal, "SoftwareTrigger", kind=Kind.config)
+    software_trigger_device = ADCpt(EpicsSignal, "SoftwareTrigger", kind=Kind.config)
 
     # buffer
     memory_polling = ADCpt(EpicsSignal, "PoolUsedMem.SCAN", kind=Kind.omitted)
diff --git a/ophyd_devices/epics/devices/psi_detector_base.py b/ophyd_devices/epics/devices/psi_detector_base.py
index 36450d2..5e18518 100644
--- a/ophyd_devices/epics/devices/psi_detector_base.py
+++ b/ophyd_devices/epics/devices/psi_detector_base.py
@@ -1,7 +1,6 @@
 import os
 import time
 
-from bec_lib.bec_service import SERVICE_CONFIG
 from bec_lib.device import DeviceStatus
 from bec_lib.file_utils import FileWriterMixin
 from ophyd import Device
@@ -246,6 +245,8 @@ class PSIDetectorBase(Device):
 
     def _update_service_config(self) -> None:
         """Update service config from BEC service config"""
+        from bec_lib.bec_service import SERVICE_CONFIG
+
         self.service_cfg = SERVICE_CONFIG.config["service_config"]["file_writer"]
 
     def _init(self) -> None: