diff --git a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
index 9802b1f..84188be 100755
--- a/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
+++ b/AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
@@ -7,6 +7,7 @@
 
 #include "ADBMS_LL_Driver.h"
 #include "config_ADBMS6830.h"
+#include "main.h"
 #include "stm32h7xx_hal.h"
 #include "swo_log.h"
 #include <stdint.h>
@@ -228,9 +229,9 @@ HAL_StatusTypeDef __pollCMD(uint16_t command, uint8_t waitTime) {
 
 void mcuAdbmsCSLow() {
   //TODO: set right GPIO
-  //HAL_GPIO_WritePin(CSB_GPIO_Port, CSB_Pin, GPIO_PIN_RESET);
+  HAL_GPIO_WritePin(BMS_CS_GPIO_Port, BMS_CS_Pin, GPIO_PIN_RESET);
 }
 
 void mcuAdbmsCSHigh() {
-  //HAL_GPIO_WritePin(CSB_GPIO_Port, CSB_Pin, GPIO_PIN_SET);
+  HAL_GPIO_WritePin(BMS_CS_GPIO_Port, BMS_CS_Pin, GPIO_PIN_SET);
 }
\ No newline at end of file
diff --git a/AMS_Master_Code/Core/Src/main.c b/AMS_Master_Code/Core/Src/main.c
index 382042b..70f5f0b 100644
--- a/AMS_Master_Code/Core/Src/main.c
+++ b/AMS_Master_Code/Core/Src/main.c
@@ -162,12 +162,12 @@ int main(void)
   MX_ADC1_Init();
   MX_ADC2_Init();
   /* USER CODE BEGIN 2 */
-  can_init(&hfdcan1);
+  //can_init(&hfdcan1);
   slaves_init(&hspi1);
-  shunt_init();
-  ts_sm_init();
-  soc_init();
-  imd_init(&htim15);
+  //shunt_init();
+  //ts_sm_init();
+  //soc_init();
+  //imd_init(&htim15);
   HAL_GPIO_WritePin(AMS_NERROR_GPIO_Port, AMS_NERROR_Pin, GPIO_PIN_SET);
   /* USER CODE END 2 */
 
@@ -177,15 +177,15 @@ int main(void)
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
-    update_sdc();
-    update_tsal_signals();
+    //update_sdc();
+    //update_tsal_signals();
 
     slaves_check();
-    shunt_check();
-    ts_sm_update();
-    soc_update();
-    imd_update();
-    can_send_status();
+    //shunt_check();
+    //ts_sm_update();
+    //soc_update();
+    //imd_update();
+    //can_send_status();
 
     loop_delay();
   }
diff --git a/AMS_Master_Code/Core/Src/slave_monitoring.c b/AMS_Master_Code/Core/Src/slave_monitoring.c
index be850c4..8588675 100644
--- a/AMS_Master_Code/Core/Src/slave_monitoring.c
+++ b/AMS_Master_Code/Core/Src/slave_monitoring.c
@@ -62,6 +62,8 @@ void slaves_check() {
   TSErrorKind slave_error = TS_ERRORKIND_NONE;
 
   AMS_Idle_Loop();
+  
+  return;
 
   //TODO: rewrite to use data from BMS driver