diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
index 8165284..3d51a03 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKmachineControl.db
@@ -27,7 +27,8 @@ record(bo, "$(P)$(R)TMPump1-ControllerOn" ) {
     field(ZNAM, "Off" )
     field(ONAM, "Pulse" )
     field(HIGH, "2.5")
-    field(FLNK, "$(P)$(R)TMPump1-ControllerOnInv" )
+# Disabled until further notice
+#    field(FLNK, "$(P)$(R)TMPump1-ControllerOnInv" )
     field(VAL,"0")
 }
 record(calcout, "$(P)$(R)TMPump1-ControllerOnInv") {
@@ -43,7 +44,8 @@ record(bo, "$(P)$(R)TMPump1-ControllerOff" ) {
     field(ZNAM, "Off" )
     field(ONAM, "Pulse" )
     field(HIGH, "2.5")
-    field(FLNK, "$(P)$(R)TMPump1-ControllerOffInv" )
+# Disabled until further notice
+#    field(FLNK, "$(P)$(R)TMPump1-ControllerOffInv" )
     field(VAL,"0")
 }
 
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
index 304a697..d6bb322 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpcf8591.db
@@ -94,6 +94,8 @@ record(ai, "$(P)$(R)Shot-TorPSCurrentImage" ) {
     field(DTYP, "Raw Soft Channel" )
     field(INP, "$(P)$(R)PCF8591:72:BYTE2_CH3 PP NMS")
     field(SCAN, ".2 second")
+#Scan Disable Input Link Value
+    field(DISA, "1")
     field(ASLO, "39.215686275" )
     field(AOFF, "0.0" )
     field(EGU,  "A" )
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db
index 1abf55e..80aaeb7 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKpfeiffer.db
@@ -1,121 +1,126 @@
+# vim: sta:et:sw=4:ts=4:sts=4
 # 8/5/2021 Only sensor 2 is working. Running with dspIC
 # 20/9/2021 sensors 1,2,3 are working. Running with dspIC
 # 20/9/2021 sensors 1,2,3 are working. Running with tty USB
 record (longin, "$(P)$(R)P001:M")
 {
-	field (DESC, "getPressure001  $(bus)")
-	field (DTYP, "stream")
-	field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)")
-#	field (SCAN, "I/O Intr")
-	field (SCAN, "1 second")
-	field (FLNK, "$(P)$(R)TMPump1-PressureAdmission")
+    field (DESC, "getPressure001  $(bus)")
+    field (DTYP, "stream")
+    field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)")
+#   field (SCAN, "I/O Intr")
+    field (SCAN, "1 second")
+    field(PHAS, "1")
+    field (FLNK, "$(P)$(R)TMPump1-PressureAdmission")
 }
 record (longin, "$(P)$(R)P001:E")
 {
-	field (DESC, "Pressure001 exponent $(bus)")
+    field (DESC, "Pressure001 exponent $(bus)")
 }
 record (calc, "$(P)$(R)TMPump1-PressureAdmission")
 {
-	field(DESC, "ISTTOK:central:TMPump1-PressureAdmission")
-	field(INPA, "$(P)$(R)P001:M")
-	field(INPB, "$(P)$(R)P001:E")
-	field(CALC, "(A*0.001)* 10.0**(B-20)")
-	field(PREC, "3") 
-	field(EGU, "mBar")
-        field(HIHI,"1.0e-2")
-        field(HIGH,"1.0e-3")
+    field(DESC, "ISTTOK:central:TMPump1-PressureAdmission")
+    # Maximize Status and Severity, MSS propagate all alarms
+    field(INPA, "$(P)$(R)P001:M MSS")
+    field(INPB, "$(P)$(R)P001:E")
+    field(CALC, "(A*0.001)* 10.0**(B-20)")
+    field(PREC, "3")
+    field(EGU, "mBar")
+    field(HIHI,"1.0e-2")
+    field(HIGH,"1.0e-3")
 #   field(LOW, "20.0")
 #   field(LOLO,"0.0")
    field(HHSV,"MAJOR")
    field(HSV, "MINOR")
 #   field(LSV, "MINOR")
-#   field(LLSV,"MAJOR")  
+#   field(LLSV,"MAJOR")
 }
 #    out "0020074002=?107";
 record (longin, "$(P)$(R)P002:M")
 {
-	field (DESC, "getPressure002  $(bus)")
-	field (DTYP, "stream")
-	field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)")
-#	field (SCAN, "I/O Intr")
-	field (SCAN, "1 second")
-	field (FLNK, "$(P)$(R)RPump1-Pressure")
+    field (DESC, "getPressure002 $(bus)")
+    field (DTYP, "stream")
+    field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)")
+#   field (SCAN, "I/O Intr")
+    field (SCAN, "1 second")
+    field(PHAS, "0")
+    field (FLNK, "$(P)$(R)RPump1-Pressure")
 }
 record (longin, "$(P)$(R)P002:E")
 {
-	field (DESC, "Pressure002 exponent $(bus)")
+    field (DESC, "Pressure002 exponent $(bus)")
 }
 record (calc, "$(P)$(R)RPump1-Pressure")
 {
-	field (DESC, "ISTTOK:central:RPump1-Pressure")
-	field(INPA, "$(P)$(R)P002:M")
-	field(INPB, "$(P)$(R)P002:E")
-	field(CALC, "(A*0.001)*10.0**(B-20)")
-	field(PREC, "3") 
-	field(EGU, "mBar")
-        field(HIHI,"1.0e-1")
-        field(HIGH,"5.0e-2")
+    field (DESC, "ISTTOK:central:RPump1-Pressure")
+    field(INPA, "$(P)$(R)P002:M MSS")
+    field(INPB, "$(P)$(R)P002:E")
+    field(CALC, "(A*0.001)*10.0**(B-20)")
+    field(PREC, "3")
+    field(EGU, "mBar")
+    field(HIHI,"1.0e-1")
+    field(HIGH,"5.0e-2")
 #   field(LOW, "20.0")
 #   field(LOLO,"0.0")
    field(HHSV,"MAJOR")
    field(HSV, "MINOR")
 #   field(LSV, "MINOR")
-#   field(LLSV,"MAJOR")  
+#   field(LLSV,"MAJOR")
 }
 
     # out "0030074002=?108";
 record (longin, "$(P)$(R)P003:M")
 {
-	field (DESC, "getPressure003 Mantissa $(bus)")
-	field (DTYP, "stream")
-	field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)")
-	field (SCAN, "1 second")
-#	field (SCAN, "I/O Intr")
-	field (FLNK, "$(P)$(R)VVessel-Pressure")
+    field (DESC, "getPressure003 Mantissa $(bus)")
+    field (DTYP, "stream")
+    field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)")
+    field (SCAN, "1 second")
+    field(PHAS, "2")
+#   field (SCAN, "I/O Intr")
+    field (FLNK, "$(P)$(R)VVessel-Pressure")
 }
 
 record (longin, "$(P)$(R)P003:E")
 {
-	field (DESC, "Pressure003 Exponent $(bus)")
+    field (DESC, "Pressure003 Exponent $(bus)")
 }
 record (calc, "$(P)$(R)VVessel-Pressure")
 {
-	field (DESC, "ISTTOK:central:VVessel-Pressure")
-	field(INPA, "$(P)$(R)P003:M")
-	field(INPB, "$(P)$(R)P003:E")
-	field(CALC, "(A*0.001)*10.0**(B-20)")
-	field(PREC, "3") 
-	field(EGU, "mBar")
-        field(HIHI,"1.0e-1")
-        field(HIGH,"1.0e-2")
-	field(HHSV,"MAJOR")
-        field(HSV, "MINOR")
+    field (DESC, "ISTTOK:central:VVessel-Pressure")
+    field(INPA, "$(P)$(R)P003:M MSS")
+    field(INPB, "$(P)$(R)P003:E")
+    field(CALC, "(A*0.001)*10.0**(B-20)")
+    field(PREC, "3")
+    field(EGU, "mBar")
+    field(HIHI,"1.0e-1")
+    field(HIGH,"1.0e-2")
+    field(HHSV,"MAJOR")
+    field(HSV, "MINOR")
 }
 
     # out "0040074002=?109";
     # NOT connected 26/10/2021
 record (longin, "$(P)$(R)P004:M")
 {
-	field (DESC, "getPressure004 Mantissa $(bus)")
-	field (DTYP, "stream")
-	field (INP, "@pfeiffer.proto getPressure004($(P)$(R)P004:E) $(bus)")
-#	field (SCAN, "1 second")
-#	field (SCAN, "I/O Intr")
-	field (FLNK, "$(P)$(R)RPump2-Pressure")
+    field (DESC, "getPressure004 Mantissa $(bus)")
+    field (DTYP, "stream")
+    field (INP, "@pfeiffer.proto getPressure004($(P)$(R)P004:E) $(bus)")
+#   field (SCAN, "1 second")
+#   field (SCAN, "I/O Intr")
+    field (FLNK, "$(P)$(R)RPump2-Pressure")
 }
 record (longin, "$(P)$(R)P004:E")
 {
-	field (DESC, "Pressure004 Exponent $(bus)")
+    field (DESC, "Pressure004 Exponent $(bus)")
 }
 
 record (calc, "$(P)$(R)RPump2-Pressure")
 {
-	field(DESC, "ISTTOK:central:RPump2-Pressure")
-	field(INPA, "$(P)$(R)P004:M")
-	field(INPB, "$(P)$(R)P004:E")
-	field(CALC, "(A*0.001)* 10.0**(B-20)")
-	field(PREC, "3") 
-	field(EGU, "mBar")
+    field(DESC, "ISTTOK:central:RPump2-Pressure")
+    field(INPA, "$(P)$(R)P004:M MSS")
+    field(INPB, "$(P)$(R)P004:E")
+    field(CALC, "(A*0.001)* 10.0**(B-20)")
+    field(PREC, "3")
+    field(EGU, "mBar")
 #   field(HIHI,"1.0e-1")
 #   field(HIGH,"5.0e-3")
 #   field(LOW, "20.0")
@@ -123,13 +128,13 @@ record (calc, "$(P)$(R)RPump2-Pressure")
 #   field(HHSV,"MAJOR")
 #   field(HSV, "MINOR")
 #   field(LSV, "MINOR")
-#   field(LLSV,"MAJOR")  
+#   field(LLSV,"MAJOR")
 }
 
 record(stringout,"$(P)$(R)RS485Debug") {
-	field(DESC, "")
-	field(DTYP, "stream")
-	field(OUT, "@pfeiffer.proto debug $(bus)")
-	field(VAL,"")
+    field(DESC, "")
+    field(DTYP, "stream")
+    field(OUT, "@pfeiffer.proto debug $(bus)")
+    field(VAL,"")
 }
 
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
index 02a55c6..b1b5ff2 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/ISTTOKstates.db
@@ -1,3 +1,4 @@
+# vim: sta:et:sw=4:ts=4:sts=4
 #
 # Project       : ISTTOK slow Control
 #
@@ -13,257 +14,267 @@
 ##
 
 record(mbbi, "$(P)$(R)OPSTATE") {
-	field(DESC, "Multiple Pulse Sequence State")
-	field(ZRVL, "0")
-	field(ONVL, "1")
-	field(TWVL, "2")
-	field(THVL, "3")
-	field(FRVL, "4")
-	field(FVVL, "5")
-	field(SXVL, "6")
-	field(SVVL, "7")
-	field(ZRST, "Stopped")
-	field(ONST, "Starting")
-	field(TWST, "Idle")
-	field(THST, "Clean")
-	field(FRST, "WaitShot")
-	field(FVST, "Stopping")
-	field(SXST, "Emergency")
-	field(SVST, "UPSEmergency")
-	field(VAL, "0")
+    field(DESC, "Multiple Pulse Sequence State")
+    field(ZRVL, "0")
+    field(ONVL, "1")
+    field(TWVL, "2")
+    field(THVL, "3")
+    field(FRVL, "4")
+    field(FVVL, "5")
+    field(SXVL, "6")
+    field(SVVL, "7")
+    field(ZRST, "Stopped")
+    field(ONST, "Starting")
+    field(TWST, "Idle")
+    field(THST, "Clean")
+    field(FRST, "WaitShot")
+    field(FVST, "Stopping")
+    field(SXST, "Emergency")
+    field(SVST, "UPSEmergency")
+    field(VAL, "0")
+    field(FLNK, "$(P)$(R)OPCALCSTATE")
+    #field(PINI, "YES")
 }
 record(mbbo, "$(P)$(R)LASTOPSTATE") {
-	info(autosaveFields, "VAL")
-	field(DESC, "Pulse Sequence Last Saved State")
-	field(ZRVL, "0")
-	field(ONVL, "1")
-	field(TWVL, "2")
-	field(THVL, "3")
-	field(FRVL, "4")
-	field(FVVL, "5")
-	field(SXVL, "6")
-	field(SVVL, "7")
-	field(ZRST, "Stopped")
-	field(ONST, "Starting")
-	field(TWST, "Idle")
-	field(THST, "Clean")
-	field(FRST, "WaitShot")
-	field(FVST, "Stopping")
-	field(SXST, "Emergency")
-	field(SVST, "UPSEmergency")
-#	field(VAL, "0")
+    info(autosaveFields, "VAL")
+    field(DESC, "Pulse Sequence Last Saved State")
+    field(ZRVL, "0")
+    field(ONVL, "1")
+    field(TWVL, "2")
+    field(THVL, "3")
+    field(FRVL, "4")
+    field(FVVL, "5")
+    field(SXVL, "6")
+    field(SVVL, "7")
+    field(ZRST, "Stopped")
+    field(ONST, "Starting")
+    field(TWST, "Idle")
+    field(THST, "Clean")
+    field(FRST, "WaitShot")
+    field(FVST, "Stopping")
+    field(SXST, "Emergency")
+    field(SVST, "UPSEmergency")
+    field(PINI, "YES")
+#   field(VAL, "0")
 }
 
+# record for bit leds
 record(calc, "$(P)$(R)OPCALCSTATE") {
-	field(DESC, "Pulse Calculated State")
-	field(CALC,"2^A")
-	field(SCAN,"1 second")
-	field(INPA,"$(P)$(R)OPSTATE.VAL PP NMS")
+    field(DESC, "Pulse Calculated State")
+    field(CALC,"2^A")
+    #field(SCAN,"1 second")
+    field(INPA,"$(P)$(R)OPSTATE.VAL NPP NMS")
 }
 
 record(calc, "$(P)$(R)STARTCALCSTATE") {
-	field(DESC, "Start Calculated State")
-	field(CALC,"2^A")
-	field(SCAN,"1 second")
-	field(INPA,"$(P)$(R)STARTINGSTATE.VAL PP NMS")
+    field(DESC, "Start Calculated State")
+    field(CALC,"2^A")
+    field(SCAN,"1 second")
+    field(INPA,"$(P)$(R)STARTINGSTATE.VAL PP NMS")
 }
 
 record(calc, "$(P)$(R)STOPPINGCALCSTATE") {
-	field(DESC, "Stop Calculated State")
-	field(CALC,"2^A")
-	field(SCAN,"1 second")
-	field(INPA,"$(P)$(R)STOPPINGSTATE.VAL PP NMS")
+    field(DESC, "Stop Calculated State")
+    field(CALC,"2^A")
+    field(SCAN,"1 second")
+    field(INPA,"$(P)$(R)STOPPINGSTATE.VAL PP NMS")
 }
 
 record(calc, "$(P)$(R)CLEANCALCSTATE") {
-	field(DESC, "Clean Automatic Calculated State")
-	field(CALC,"(2^(A+1))-1")
-	field(SCAN,"1 second")
-	field(INPA,"$(P)$(R)CLEANINGSTATE.VAL PP NMS")
+    field(DESC, "Clean Automatic Calculated State")
+    field(CALC,"(2^(A+1))-1")
+    field(SCAN,"1 second")
+    field(INPA,"$(P)$(R)CLEANINGSTATE.VAL PP NMS")
 }
 
 
 record(calc, "$(P)$(R)WSHOTCALCSTATE") {
-	field(DESC, "WaitShot Calculated State")
-	field(CALC,"2^A")
-	field(SCAN,"1 second")
-	field(INPA,"$(P)$(R)WSHOTINGSTATE.VAL PP NMS")
+    field(DESC, "WaitShot Calculated State")
+    field(CALC,"2^A")
+    field(SCAN,"1 second")
+    field(INPA,"$(P)$(R)WSHOTINGSTATE.VAL PP NMS")
 }
 
 #record(ai, "$(P)$(R)Temperature_0") {
-#	field(DESC, "ISTTOK Temperature 0 Calculated")
-#	field(EGU, "C")
-#	field(SCAN,"1 second")
+#   field(DESC, "ISTTOK Temperature 0 Calculated")
+#   field(EGU, "C")
+#   field(SCAN,"1 second")
 #}
 
 record(bo, "$(P)$(R)UPS-OnBattery") {
-	info(autosaveFields, "VAL STAT")
-	field(DESC, "Main APC UPS On Battery status")
-	field(VAL, "0")
-	field(ZNAM, "OFF")
-	field(ONAM, "ON")
+    info(autosaveFields, "VAL STAT")
+    field(DESC, "Main APC UPS On Battery status")
+    field(VAL, "0")
+    field(ZNAM, "OFF")
+    field(ONAM, "ON")
     field(OSV, "MAJOR")
 }
 
 record(bo, "$(P)$(R)UPS-Shutdown") {
-	info(autosaveFields, "VAL STAT")
-	field(DESC, "Main APC UPS Shutdown request")
-#	field(VAL, "0")
-	field(ZNAM, "OFF")
-	field(ONAM, "ON")
+    info(autosaveFields, "VAL STAT")
+    field(DESC, "Main APC UPS Shutdown request")
+#   field(VAL, "0")
+    field(ZNAM, "OFF")
+    field(ONAM, "ON")
     field(OSV, "MAJOR")
+    field(PINI, "YES")
 }
 
 record(bo, "$(P)$(R)OPREQ") {
-	info(autosaveFields, "VAL")
-	field(DESC, "Pulse Sequence Start/Stop")
-#	field(VAL, "0")
-	field(ZNAM, "STOP")
-	field(ONAM, "START")
+    info(autosaveFields, "VAL")
+    field(DESC, "Pulse Sequence Start/Stop")
+#   field(VAL, "0")
+    field(PINI, "YES")
+    field(ZNAM, "STOP")
+    field(ONAM, "START")
 }
 
 record(bo, "$(P)$(R)CLEANINGMANMODE") {
-	info(autosaveFields, "VAL")
-	field(DESC, "Cleaning Manual/Auto")
-	info(autosaveFields, "VAL")
-#	field(VAL, "1")
-	field(ZNAM, "M")
-	field(ONAM, "A")
+    info(autosaveFields, "VAL")
+    field(DESC, "Cleaning Manual/Auto")
+    info(autosaveFields, "VAL")
+#   field(VAL, "1")
+    field(ZNAM, "M")
+    field(ONAM, "A")
 }
 
 
 record(bo, "$(P)$(R)FSTriggerStart") {
-	field(DESC, "FireSignal Trigger Start")
-	field(VAL, "0")
-	field(ZNAM, "STOP")
-	field(ONAM, "START")
+    field(DESC, "FireSignal Trigger Start")
+    field(VAL, "0")
+    field(PINI, "YES")
+    field(ZNAM, "STOP")
+    field(ONAM, "START")
 }
 
 record(bo, "$(P)$(R)PROCESS-MODE") {
-	info(autosaveFields, "VAL")
-	field(DESC, "Plasma Process Mode")
-	#field(VAL, "0")
-	field(ZNAM, "CLEAN")
-	field(ONAM, "SHOT")
+    info(autosaveFields, "VAL")
+    field(DESC, "Plasma Process Mode")
+    #field(VAL, "0")
+    field(PINI, "YES")
+    field(ZNAM, "CLEAN")
+    field(ONAM, "SHOT")
 }
 
 record(bo, "$(P)$(R)PROCESS-REQ") {
-	field(DESC, "Plasma Process sub-states Start/Stop")
-	field(VAL, "0")
-	field(ZNAM, "STOP")
-	field(ONAM, "START")
+    field(DESC, "Plasma Process sub-states Start/Stop")
+    field(VAL, "0")
+    field(PINI, "YES")
+    field(ZNAM, "STOP")
+    field(ONAM, "START")
 }
 
 record(bo, "$(P)$(R)AUTHORISATION") {
-	field(DESC, "Pulse Sequence Authorisation Start/Abort")
-	field(ZNAM, "ABORT")
-	field(ONAM, "START")
-	field(VAL, "0")
+    field(DESC, "Pulse Sequence Authorisation Start/Abort")
+    field(ZNAM, "ABORT")
+    field(ONAM, "START")
+    field(VAL, "0")
 }
 
 record(longout, "$(P)$(R)PULSE-NUMBER") {
-	info(autosaveFields, "VAL")
-	field(DESC, "Pulse Number")
+    info(autosaveFields, "VAL")
+    field(DESC, "Pulse Number")
+    field(PINI, "YES")
 }
 
 record(calc, "$(P)$(R)COUNTDOWN") {
-	field(DESC, "Countdown Increment")
-	field(INPA,"$(P)$(R)COUNTDOWN")
-	field(SCAN,"Passive")
-	field(CALC,"A+1")
-	field(VAL, "160")
+    field(DESC, "Countdown Increment")
+    field(INPA,"$(P)$(R)COUNTDOWN")
+    field(SCAN,"Passive")
+    field(CALC,"A+1")
+    field(VAL, "160")
 }
 
 record(calc, "$(P)$(R)COUNTER") {
-	field(DESC, "0.1 s counter")
-	field(INPA, "$(P)$(R)COUNTER")
-	field(SCAN, ".1 second")
-	field(CALC, "A + .1")
+    field(DESC, "0.1 s counter")
+    field(INPA, "$(P)$(R)COUNTER")
+    field(SCAN, ".1 second")
+    field(CALC, "A + .1")
 }
 
 record(stringin, "$(P)$(R)CurrentTime") {
-	field(DESC, "Current Date and Time of the IOC")
-	field(SCAN, "1 second")
-	field(DTYP, "Soft Timestamp")
-	field(PINI, "YES")
-	field(INP, "@%d/%m/%Y %H:%M:%S")
+    field(DESC, "Current Date and Time of the IOC")
+    field(SCAN, "1 second")
+    field(DTYP, "Soft Timestamp")
+    #field(PINI, "YES")
+    field(INP, "@%d/%m/%Y %H:%M:%S")
 }
 
 record(stringout, "$(P)$(R)TraceMessage") {
-	field(DESC, "Trace Message from IOC")
-	field(VAL, "Trace mode ON")
+    field(DESC, "Trace Message from IOC")
+    field(VAL, "Trace mode ON")
 }
 
 record(stringout, "$(P)$(R)LogMessage") {
-	field(DESC, "Log Message ")
-#	field(VAL, "Trace mode ON")
+    field(DESC, "Log Message ")
+#   field(VAL, "Trace mode ON")
 }
 
 record(mbbi, "$(P)$(R)STARTINGSTATE") {
-	field(DESC, "Starting State Sequence")
-	field(ZRVL, "0")
-	field(ONVL, "1")
-	field(TWVL, "2")
-	field(THVL, "3")
-	field(FRVL, "4")
-	field(FVVL, "5")
-	field(ZRST, "NonStarting")
-	field(ONST, "Starting1")
-	field(TWST, "WaitManV")
-	field(THST, "WaitPress")
-	field(FRST, "WaitTMP")
-	field(FVST, "StartEnd")
-	field(VAL, "0")
+    field(DESC, "Starting State Sequence")
+    field(ZRVL, "0")
+    field(ONVL, "1")
+    field(TWVL, "2")
+    field(THVL, "3")
+    field(FRVL, "4")
+    field(FVVL, "5")
+    field(ZRST, "NonStarting")
+    field(ONST, "Starting1")
+    field(TWST, "WaitManV")
+    field(THST, "WaitPress")
+    field(FRST, "WaitTMP")
+    field(FVST, "StartEnd")
+    field(VAL, "0")
 }
 
 record(mbbi, "$(P)$(R)CLEANINGSTATE") {
-	field(DESC, "Cleaning State Sequence")
-	field(ZRVL, "0")
-	field(ONVL, "1")
-	field(TWVL, "2")
-	field(THVL, "3")
-	field(FRVL, "4")
-	field(FVVL, "5")
-	field(ZRST, "NonCleaning")
-	field(ONST, "Cleaning1")
-	field(TWST, "Cleaning2")
-	field(THST, "Cleaning3")
-	field(FRST, "Cleaning4")
-	field(FVST, "Cleaning5")
-	field(VAL, "0")
+    field(DESC, "Cleaning State Sequence")
+    field(ZRVL, "0")
+    field(ONVL, "1")
+    field(TWVL, "2")
+    field(THVL, "3")
+    field(FRVL, "4")
+    field(FVVL, "5")
+    field(ZRST, "NonCleaning")
+    field(ONST, "Cleaning1")
+    field(TWST, "Cleaning2")
+    field(THST, "Cleaning3")
+    field(FRST, "Cleaning4")
+    field(FVST, "Cleaning5")
+    field(VAL, "0")
 }
 
 record(mbbi, "$(P)$(R)WSHOTINGSTATE") {
-	field(DESC, "Plasma Shot State Sequence")
-	field(ZRVL, "0")
-	field(ONVL, "1")
-	field(TWVL, "2")
-	field(THVL, "3")
-	field(FRVL, "4")
-	field(FVVL, "5")
-	field(SXVL, "6")
-	field(SVVL, "7")
-	field(EIVL, "8")
-	field(NIVL, "9")
-	field(TEVL, "10")
-	field(ELVL, "11")
-	field(TVVL, "12")
-	field(TTVL, "13")
-	field(ZRST, "NonShooting")
-	field(ONST, "ShotWTrig")
-	field(TWST, "Shooting2")
-	field(THST, "Shooting3")
-	field(FRST, "Shooting4")
-	field(FVST, "Shooting5")
-	field(SXST, "Shooting6")
-	field(SVST, "Shooting7")
-	field(EIST, "Shooting8")
-	field(NIST, "Shooting9")
-	field(TEST, "Shooting10")
-	field(ELST, "Shooting11")
-	field(TVST, "Shooting12")
-	field(TTST, "ShotEnd")
-	field(VAL, "0")
+    field(DESC, "Plasma Shot State Sequence")
+    field(ZRVL, "0")
+    field(ONVL, "1")
+    field(TWVL, "2")
+    field(THVL, "3")
+    field(FRVL, "4")
+    field(FVVL, "5")
+    field(SXVL, "6")
+    field(SVVL, "7")
+    field(EIVL, "8")
+    field(NIVL, "9")
+    field(TEVL, "10")
+    field(ELVL, "11")
+    field(TVVL, "12")
+    field(TTVL, "13")
+    field(ZRST, "NonShooting")
+    field(ONST, "ShotWTrig")
+    field(TWST, "Shooting2")
+    field(THST, "Shooting3")
+    field(FRST, "Shooting4")
+    field(FVST, "Shooting5")
+    field(SXST, "Shooting6")
+    field(SVST, "Shooting7")
+    field(EIST, "Shooting8")
+    field(NIST, "Shooting9")
+    field(TEST, "Shooting10")
+    field(ELST, "Shooting11")
+    field(TVST, "Shooting12")
+    field(TTST, "ShotEnd")
+    field(VAL, "0")
 }
 
 record(mbbi, "$(P)$(R)STOPPINGSTATE") {
diff --git a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pfeiffer.proto b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pfeiffer.proto
index 71ea537..bbc1bb8 100644
--- a/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pfeiffer.proto
+++ b/epics/iocs/ISTTOKrpi/ISTTOKrpiApp/Db/pfeiffer.proto
@@ -1,18 +1,18 @@
-Terminator=CR; 
+Terminator = CR;
+inTerminator = CR;
 # CR and LF are control characters, respectively coded 0x0D (13 decimal) and 0x0A (10 decimal)
-# CR and LF are control characters, respectively coded 0x0D (13 decimal) and 0x0A (10 decimal)
-MaxInput = 30;
+MaxInput = 20;
 ExtraInput = Ignore;
 
 # Values in millisecond
-LockTimeout = 1000;
+LockTimeout = 500;
 # Affects first out command in a protocol.
 #  If other records currently use the device, how many milliseconds to wait for 
 # exclusive access to the device before giving up? 
 
 #ReadTimeout = 1500;
 
-ReplyTimeout = 400;
+ReplyTimeout = 300;
 
 #PollPeriod = $ReplyTimeout;
 #Integer. Affects first in command in I/O Intr mode (see chapter Record Processing).
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
index 3463283..b28827a 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/iocISTTOKrpi.req
@@ -1,8 +1,9 @@
-ISTTOK:central:PULSE-NUMBER.VAL
+# P=ISTTOK:,R=central:
+$(P)$(R)PULSE-NUMBER.VAL
 ISTTOK:central:LogMessage.VAL
 
 ISTTOK:central:LASTOPSTATE.VAL
-ISTTOK:central:OPREQ
+ISTTOK:central:OPREQ.VAL
 ISTTOK:central:PROCESS-MODE.VAL
 ISTTOK:central:CLEANINGMANMODE.VAL
 
@@ -12,7 +13,7 @@ ISTTOK:central:Shot-TorPSCurrent
 ISTTOK:central:UPS-Shutdown
 
 #ALARM Limits
-ISTTOK:central:RPump1-Pressure.HIGH
+$(P)$(R)RPump1-Pressure.HIGH
 ISTTOK:central:RPump1-Pressure.HIHI
 #ISTTOK:central:RPump2-Pressure.HIGH
 #ISTTOK:central:RPump2-Pressure.HIHI
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
index b4f1cc0..1180d38 100644
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/save/iocISTTOKrpi.sav
@@ -1,8 +1,8 @@
-# autosave R5.3	Automatically generated - DO NOT MODIFY - 211214-141949
+# autosave R5.3	Automatically generated - DO NOT MODIFY - 211215-002448
 ISTTOK:central:PULSE-NUMBER.VAL 0
 ISTTOK:central:LogMessage.VAL 
-ISTTOK:central:LASTOPSTATE.VAL 5
-ISTTOK:central:OPREQ 0
+ISTTOK:central:LASTOPSTATE.VAL 2
+ISTTOK:central:OPREQ.VAL 1
 ISTTOK:central:PROCESS-MODE.VAL 0
 ISTTOK:central:CLEANINGMANMODE.VAL 0
 ISTTOK:central:Emergency-UserButton.VAL 0
diff --git a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
index 5ff2d50..d928e76 100755
--- a/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
+++ b/epics/iocs/ISTTOKrpi/iocBoot/iocISTTOKrpi/st.cmd
@@ -46,10 +46,10 @@ dbLoadRecords("db/sendmail.db", "P=ISTTOK:,PORT=L0,R=central:,L=0,A=0")
 
 # Uncomment to Debug STREAMDEVICE serial activity
 # 2021/12/14 13:11:50.019969 RS0 ISTTOK:central:P002:M: No reply within 200 ms to "0020074002=?107<0d>
-#var streamError 1
+var streamError 1
 #with this no errors on pfeiffer bus
-var streamDebug 1
-streamSetLogfile("logfile.txt")
+#var streamDebug 1
+#streamSetLogfile("logfile.txt")
 
 ## Run this to trace the stages of iocInit
 #traceIocInit
@@ -70,11 +70,11 @@ asSetFilename("${TOP}/iocBoot/${IOC}/access_security.acf")
 
 iocInit
 
-#asInit
+asInit
 
 # Create request file and start periodic 'save’
 # makeAutosaveFileFromDbInfo("$(SAVE_DIR)/$(IOC).req", "autosaveFields")
-create_monitor_set("$(IOC).req", 30)
+create_monitor_set("$(IOC).req", 30, "P=ISTTOK:,R=central:")
 
 ## Start any sequence programs , use safe mode
 seq  IsttokSeqExec "unit=ISTTOK"