diff --git a/beamstop/sans_llb_beamstop.db b/beamstop/sans_llb_beamstop.db
index e4f83c5..9b9b2d6 100644
--- a/beamstop/sans_llb_beamstop.db
+++ b/beamstop/sans_llb_beamstop.db
@@ -128,7 +128,8 @@ record(calcout, "$(INSTR)$(SPS_REGISTER_NAME):RETRY-ERROR")
   field(INPB, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP_RBV")
   field(INPC, "$(INSTR)$(SPS_REGISTER_NAME):BUSY")
   field(INPD, "$(INSTR)$(SPS_REGISTER_NAME):MOVES")
-  field(CALC, "A#B&&C=0&&D=0?1:0")
+  field(INPE, "$(INSTR)$(SPS_REGISTER_NAME):IN-POSITION NPP")
+  field(CALC, "A#B&&C=0&&D=0&&E=1?1:0")
   field(OOPT, "When Non-zero")
   field(OUT, "$(INSTR)$(SPS_REGISTER_NAME):MAP-STATUS PP")
 }
@@ -146,7 +147,7 @@ record(calc, "$(INSTR)$(SPS_REGISTER_NAME):MAP-STATUS")
   field(INPH, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP NPP")
   field(INPI, "$(INSTR)$(SPS_REGISTER_NAME):BEAMSTOP_RBV NPP")
   field(INPK, "$(INSTR)$(SPS_REGISTER_NAME):RETRY-ERROR NPP")
-  field(CALC, "(F=0||G=0||D=1||K=1)?3:(A=1)?2:(C=1||H#I)?1:(B=0)?3:0")
+  field(CALC, "(F=0||G=0||D=1||K=1)?3:(A=1)?2:(B=0||C=1||H#I)?1:0")
   field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):STATUS PP")
 }