diff --git a/db/shutter.db b/db/shutter.db
index 3ba64c0..fa079c1 100644
--- a/db/shutter.db
+++ b/db/shutter.db
@@ -31,7 +31,8 @@ record(calc, "$(INSTR)$(SPS_REGISTER_NAME):MAP-STATUS")
   field(INPC, "$(INSTR)$(SPS_REGISTER_NAME):REMOTE-OKAY NPP")
   field(INPD, "$(INSTR)$(SPS_REGISTER_NAME):PSYS-OK NPP")
   field(INPE, "$(INSTR)$(SPS_REGISTER_NAME):EMERGENCY-STOP-OFF NPP")
-  field(CALC, "(E=0||B=0)?2:(A=0||D=0)?1:C=0?2:0")
+  field(INPF, "$(INSTR)$(SPS_REGISTER_NAME):MOVES NPP")
+  field(CALC, "(E=0||B=0)?3:(A=0||D=0)?2:F=1?1:C=0?3:0")
   field(SCAN, ".1 second")
   field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):STATUS PP")
 }
@@ -43,14 +44,22 @@ record(mbbi, "$(INSTR)$(SPS_REGISTER_NAME):STATUS")
   field(ZRVL, "0")
   field(ZRST, "Okay")
   field(ONVL, "1")
-  field(ONST, "Warning")
+  field(ONST, "Busy")
   field(TWVL, "2")
-  field(TWST, "Error")
+  field(TWST, "Warning")
   field(THVL, "3")
-  field(THST, "Unknown")
+  field(THST, "Error")
+  field(FRST, "4")
+  field(FRST, "Unknown")
   field(FLNK, "$(INSTR)$(SPS_REGISTER_NAME):STATUS-Msg PP")
 }
 
+record(stringout, "$(INSTR)$(SPS_REGISTER_NAME):MOTION-Msg")
+{
+  field(DESC, "Shutter opening/closing message")
+  field(VAL, "Shutter in motion")
+}
+
 record(scalcout, "$(INSTR)$(SPS_REGISTER_NAME):STATUS-Msg")
 {
   field(DESC, "Status Message")
@@ -60,6 +69,7 @@ record(scalcout, "$(INSTR)$(SPS_REGISTER_NAME):STATUS-Msg")
   field(INPE, "$(INSTR)$(SPS_REGISTER_NAME):REMOTE-OKAY NPP")
   field(INPF, "$(INSTR)$(SPS_REGISTER_NAME):PSYS-OK NPP")
   field(INPG, "$(INSTR)$(SPS_REGISTER_NAME):EMERGENCY-STOP-OFF NPP")
+  field(INPH, "$(INSTR)$(SPS_REGISTER_NAME):MOVES NPP")
   field(INAA, "$(INSTR)$(SPS_REGISTER_NAME):OPEN-Msg NPP")
   field(INBB, "$(INSTR)$(SPS_REGISTER_NAME):REMOTE-Msg NPP")
   field(INCC, "$(INSTR)$(SPS_REGISTER_NAME):SHUTTER-READY-Msg NPP")
@@ -67,5 +77,6 @@ record(scalcout, "$(INSTR)$(SPS_REGISTER_NAME):STATUS-Msg")
   field(INEE, "$(INSTR)$(SPS_REGISTER_NAME):BLOCKED-Msg NPP")
   field(INFF, "$(INSTR)$(SPS_REGISTER_NAME):BLOCKED-REASON-Msg NPP")
   field(INGG, "$(INSTR)$(SPS_REGISTER_NAME):PSYS-OK-Msg NPP")
-  field(CALC, 'G=0?DD:D=0?(EE+": "+FF):F=0?GG:C=0?CC:E=0?BB:AA')
+  field(INHH, "$(INSTR)$(SPS_REGISTER_NAME):MOTION-Msg NPP")
+  field(CALC, 'H=1?HH:G=0?DD:D=0?(EE+": "+FF):F=0?GG:C=0?CC:E=0?BB:AA')
 }
diff --git a/templates/shutter.substitutions b/templates/shutter.substitutions
index 5cb117f..6e7893c 100644
--- a/templates/shutter.substitutions
+++ b/templates/shutter.substitutions
@@ -14,9 +14,10 @@ file "$(sinqSPS_DB)/readbit.db"
   {1     , 1  , "SHUTTER-READY"     , ""       , ""       , ""  }
   {1     , 2  , "EMERGENCY-STOP-OFF", ""       , ""       , ""  }
   {1     , 3  , "NOT-LOCKED"        , ""       , ""       , ""  }
-  {1     , 4  , "CLOSED"            , "Closed" , "Open"   , ""  }
-  {1     , 5  , "OPEN"              , "Open"   , "Closed" , ""  }
+  {1     , 4  , "CLOSED"            , "closed" , "open"   , ""  }
+  {1     , 5  , "OPEN"              , "open"   , "closed" , ""  }
   {1     , 6  , "REMOTE-OKAY"       , ""       , ""       , ""  }
+  {1     , 7  , "MOVES"             , ""       , ""       , ""  }
 }
 
 # The way that the strings are currently implemented in the SPS, the first two