diff --git a/src/aare/daq/spreadsheetupdater.py b/src/aare/daq/spreadsheetupdater.py
index 110e0002..79e98f5e 100644
--- a/src/aare/daq/spreadsheetupdater.py
+++ b/src/aare/daq/spreadsheetupdater.py
@@ -3,9 +3,9 @@ import json
 import websocket
 import time
 from aareDBclient.models import PuckWithTellPosition
-from aaredaqlib.models import SampleShortInfoList, SampleShortInfo, DewarAddress
+from aare.common.models import SampleShortInfoList, SampleShortInfo, DewarAddress
 from config import BeamlineConfig
-from aaredaqlib.beamline import MXBeamline
+from aare.common.beamline import MXBeamline
 
 SLOT_IDENTIFIER = "X10SA"
 WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/tell_runner/ws/samples-spreadsheet/{SLOT_IDENTIFIER}"
diff --git a/src/aare/daq/tellupdater.py b/src/aare/daq/tellupdater.py
index b38b5231..a32678a8 100644
--- a/src/aare/daq/tellupdater.py
+++ b/src/aare/daq/tellupdater.py
@@ -5,21 +5,24 @@ import sseclient
 import requests
 import time
 from aareDBclient.models import PuckWithTellPosition
-#from mxlibs3.tell_client import TellClient
-#from aaredb import AareWrapper  # Make sure the import path fits your project
-#from aaredaqlib.beamline import MXBeamline
+
+#from aare.daq.spreadsheetupdater import SLOT_IDENTIFIER
+from aare.devices.tell_client import TellClient
+from aaredb import AareWrapper  # Make sure the import path fits your project
+from aare.common.beamline import MXBeamline, mx_beamline
 
 # Configuration
+#SLOT_IDENTIFIER = mx_beamline().value.upper()
 SLOT_IDENTIFIER = "X10SA"
-#WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
-WS_URL = f"wss://localhost:8001/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
+WS_URL = f"wss://mx-db-01.psi.ch/dispatcher/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
+#WS_URL = f"wss://localhost:8001/protected_router/wstell/ws/slot/{SLOT_IDENTIFIER}"
 WS_HEADERS = [f"X-Shared-Password: {os.getenv('AAREDB_SHARED_PASSWORD')}"]
 print(WS_HEADERS)
 
 # Initialize TELL client and DB wrapper
-beamline = None  #MXBeamline.X06DA  # Use your beamline enum/value
-tell_client = None #TellClient(bl=beamline)
-aare_db = None #AareWrapper(bl=beamline)
+beamline =  mx_beamline()  # Use your beamline enum/value
+tell_client = TellClient(bl=beamline)
+aare_db = AareWrapper(bl=beamline)
 
 # Track current state
 current_pucks = []