diff --git a/beamstop/beamstop_motors.proto b/beamstop/beamstop_motors.proto
index 18e7deb..420e5d5 100644
--- a/beamstop/beamstop_motors.proto
+++ b/beamstop/beamstop_motors.proto
@@ -11,9 +11,6 @@ st {
   InTerminator = CR ACK;
   out "P553 Q401 Q501";
   in "%(A)d%*[ ]%(B)f%*[ ]%(C)f";
-  # Multi Record Version
-  # out "P553Q401 Q501";
-  # in "%d%*[ ]%(\$1:BS:TARGET_X)f%*[ ]%(\$1:BS:TARGET_Y)f";
 }
 
 stop {
diff --git a/beamstop/sans_llb_beamstop.db b/beamstop/sans_llb_beamstop.db
index cf7bbc5..c5b0545 100644
--- a/beamstop/sans_llb_beamstop.db
+++ b/beamstop/sans_llb_beamstop.db
@@ -385,18 +385,17 @@ record(calcout,  "$(BS_MCU):BS:INVALID") {
   field(INPA, "$(BS_MCU):BS:TARGET_BS NPP MS")
   field(INPB, "$(BS_MCU):BS:TARGET_RANGE NPP MS")
   field(INPC, "$(BS_MCU):BS:LOADED NPP MS")
-  field(CALC, "A<4 & B=1 & A#C")
-  field(OOPT, "When Non-zero")
+  field(CALC, "(A<4) && (B=1) && (A#C)")
+  field(OOPT, "Transition To Non-zero")
   field(OUT,  "$(BS_MCU):BS:IMMEDIATE_STOP.PROC PP")
 }
 
 record(longout,  "$(BS_MCU):BS:IMMEDIATE_STOP") {
   field(DESC, "Invalid Move STOP MOTORS!")
-  field(PINI, "NO")
-  field(OMSL, "closed_loop")
-  field(DOL, "1")
   # For Test
   # field(OUT, "TEST_RECORD PP")
+  # field(OMSL, "closed_loop")
+  # field(DOL, "1")
   # FOR REAL
   field(DTYP,  "stream")
   field(OUT ,  "@$(PROTO) stop() $(BS_MCU_ASYN_PORT) 0")