diff --git a/CAENMCAApp/Db/CAENMCA.db b/CAENMCAApp/Db/CAENMCA.db
index 25e3d49..845a8ba 100644
--- a/CAENMCAApp/Db/CAENMCA.db
+++ b/CAENMCAApp/Db/CAENMCA.db
@@ -201,7 +201,7 @@ record(seq, "$(P)$(Q)ENDBEGALL:SP")
 {
     field(SELM, "All")
     field(LNK0, "$(P)$(Q)ENDALL:SP PP")
-    field(DLY1, "1")
+    field(DLY1, "3")
     field(LNK1, "$(P)$(Q)BEGINALL:SP PP")
 }
 
@@ -210,7 +210,7 @@ record(seq, "$(P)$(Q)ENDBEGALL:SP")
 # automatically
 record(ao, "$(P)$(Q)LISTFILE:SIZE:MAX:SP")
 {
-    field(VAL, "2000")
+    field(VAL, "1900")
     field(EGU, "MB")
     field(DESC, "Max list file size")
     field(PINI, "YES")
diff --git a/CAENMCAApp/Db/CAENMCAChan.db b/CAENMCAApp/Db/CAENMCAChan.db
index 2218daa..eee72e0 100644
--- a/CAENMCAApp/Db/CAENMCAChan.db
+++ b/CAENMCAApp/Db/CAENMCAChan.db
@@ -383,15 +383,21 @@ record(ai, "$(P)$(Q)C$(CHAN):LISTFILE:SIZE")
 	field(SCAN, "I/O Intr")
 }
 
+# Run on 10 second scan as checking ENDBEGALL:SP.PACT is not enough
+# need to allow time for file size PV to have been updated which will
+# happen a little after ENDBEGALL has completed
+# need scan time to be > delay in ENDBEGALL 
 record(calcout, "$(P)$(Q)C$(CHAN):LISTFILE:RESTART")
 {
     field(INPA, "$(P)$(Q)C$(CHAN):LISTFILE:SIZE")
     field(INPB, "$(P)$(Q)LISTFILE:SIZE:MAX:SP")
     field(INPC, "$(P)$(Q)ENDBEGALL:SP.PACT")
-    field(CALC, "C == 0 && A > B")
+    field(INPD, "$(P)$(Q)C$(CHAN):ACQ:RUNNING")
+    field(INPE, "$(P)DAE:RUNSTATE")
+    field(CALC, "C==0&&D==1&&E==2&&A>B")
     field(OOPT, "When Non-zero")
     field(OUT, "$(P)$(Q)ENDBEGALL:SP PP")
-    field(SCAN, "1 second")
+    field(SCAN, "10 second")
 }
 
 record(longin, "$(P)$(Q)C$(CHAN):LISTMODE:MAXNEVENTS")