diff --git a/eive_tmtc/tmtc/com/syrlinks_handler.py b/eive_tmtc/tmtc/com/syrlinks_handler.py
index 173db7e..d4cbced 100644
--- a/eive_tmtc/tmtc/com/syrlinks_handler.py
+++ b/eive_tmtc/tmtc/com/syrlinks_handler.py
@@ -152,12 +152,10 @@ def pack_syrlinks_command(
     q.add_log_cmd(f"Testing Syrlinks with object id: {object_id.as_hex_string}")
     if op_code == OpCode.OFF:
         q.add_log_cmd(f"{prefix}: {Info.OFF}")
-        data = pack_mode_data(obyt, Mode.OFF, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
+        q.add_pus_tc(create_mode_command(obyt, Mode.OFF, 0))
     if op_code == OpCode.ON:
         q.add_log_cmd(f"{prefix}: {Info.ON}")
-        data = pack_mode_data(obyt, Mode.ON, 0)
-        q.add_pus_tc(PusTelecommand(service=200, subservice=1, app_data=data))
+        q.add_pus_tc(create_mode_command(obyt, Mode.ON, 0))
     if op_code == OpCode.NORMAL:
         normal_mode_cmd(q, Info.NORMAL, Submode.DEFAULT)
     if op_code == OpCode.NORMAL_RX_ONLY: