diff --git a/db/sans_llb_beamstop.db b/db/sans_llb_beamstop.db
index a2eda5a..b0fad3a 100644
--- a/db/sans_llb_beamstop.db
+++ b/db/sans_llb_beamstop.db
@@ -179,20 +179,30 @@ record(calcout, "$(INSTR)$(SPS_REGISTER_NAME):SET-READY")
   field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-MOTORS")
 }
 
-record(calc, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-MOTORS")
+record(calc, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-BSX")
 {
   field(DESC, "Whether to block bsx and bsy")
   field(INPA, "$(INSTR)$(SPS_REGISTER_NAME):STATUS NPP")
-  field(CALC, "A=0?0:1")
+  field(INPB, "$(BSX_MOT).DISA NPP")
+  field(CALC, "A=0?~B:B")
+  field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-BSY PP")
+}
+
+record(calc, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-BSY")
+{
+  field(DESC, "Whether to block bsx and bsy")
+  field(INPA, "$(INSTR)$(SPS_REGISTER_NAME):STATUS NPP")
+  field(INPB, "$(BSY_MOT).DISA NPP")
+  field(CALC, "A=0?~B:B")
   field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP-MOTOR-BLOCK PP")
 }
 
 record(seq, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP-MOTOR-BLOCK")
 {
  field(DESC, "Block moving bsx and bsy")
- field(DOL0, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-MOTORS NPP")
+ field(DOL0, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-BSX NPP")
  field(LNK0, "$(BSX_MOT).DISV PP")
- field(DOL1, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-MOTORS NPP")
+ field(DOL1, "$(INSTR)$(SPS_REGISTER_NAME):SHOULD-BLOCK-BSY NPP")
  field(LNK1, "$(BSY_MOT).DISV PP")
  field(SELM, "All")
 }