diff --git a/ADApp/Db/ADBase.template b/ADApp/Db/ADBase.template
index ccdf650..1b32dd4 100644
--- a/ADApp/Db/ADBase.template
+++ b/ADApp/Db/ADBase.template
@@ -421,41 +421,15 @@ record(longin, "$(P)$(D)FrameCounter_RBV")
     field(SCAN, "I/O Intr")
 }
 
-record(ai, "$(P)$(D)FrameRate_RBV")
+# This record needs work, because B should reflect the time since last processed
+record(calc, "$(P)$(D)FrameRate_RBV")
 {
-    field(PINI, "1")
-    field(DTYP, "asynFloat64")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))FRAME_RATE")
-    field(PREC, "3")
-    field(SCAN, "I/O Intr")
-}
-
-###################################################################
-#  These records control connection management                    # 
-###################################################################
-
-record(mbbo, "$(P)$(D)Connect")
-{
-   field(DTYP, "asynInt32")
-   field(OUT,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))CONNECT")
-   field(ZRST, "Disconnect")
-   field(ZRVL, "0")
-   field(ONST, "Connect")
-   field(ONVL, "1")
-}
-
-record(mbbi, "$(P)$(D)Connect_RBV")
-{
-   field(PINI, "1")
-   field(DTYP, "asynInt32")
-   field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))CONNECT")
-   field(ZRST, "Disconnected")
-   field(ZRVL, "0")
-   field(ZRSV, "MAJOR")
-   field(ONST, "Connected")
-   field(ONVL, "1")
-   field(ONSV, "NO_ALARM")
-   field(SCAN, "I/O Intr")
+    field(INPA, "$(P)$(D)FrameRate_RBV.B NPP NMS")  # Previous counter value
+    field(INPB, "$(P)$(D)FrameCounter_RBV NPP NMS") # Current counter value
+    field(INPC, "1.0")                              # Delta time, needs work
+    field(CALC, "(B-A)/C")
+    field(PREC, "1")
+    field(SCAN, "1 second")
 }
 
 ###################################################################
@@ -494,16 +468,6 @@ record(mbbi, "$(P)$(D)DetectorState_RBV")
     field(SCAN, "I/O Intr")
 }
 
-# File path.
-record(waveform, "$(P)$(D)StatusString_RBV")
-{
-    field(PINI, "1")
-    field(DTYP, "asynOctetRead")
-    field(INP,  "@asyn($(PORT),$(ADDR),$(TIMEOUT))STATUS_STRING")
-    field(FTVL, "UCHAR")
-    field(NELM, "256")
-    field(SCAN, "I/O Intr")
-}
 
 ###################################################################
 #  These records control file I/O                                 # 
@@ -685,6 +649,17 @@ record(mbbi, "$(P)$(D)FileFormat_RBV")
     field(SCAN, "I/O Intr")
 }
 
+###################################################################
+#  The asynRecord is used for mainly for trace mask               # 
+###################################################################
+ 
+# Set ASYN_TRACEIO_HEX bit by default
+record(asyn,"$(P)$(D)AsynIO")
+{
+    field(PORT, $(PORT))
+    field(TIB2,"1")
+}
+
 ###################################################################
 #  Records past here need work!!!!                                # 
 ###################################################################
@@ -826,10 +801,3 @@ record(stringin, "$(P)$(D)Comment6")
    field(DESC, "Comment 6")
 }
 
-# This asynRecord is used for debug flags
-# Set ASYN_TRACEIO_ESCAPE bit
-record(asyn,"$(P)$(D)AsynIO")
-{
-    field(PORT, $(PORT))
-    field(TIB1,"1")
-}