diff --git a/lcls-twincat-motion/Library/Library.plcproj b/lcls-twincat-motion/Library/Library.plcproj
index 8d7b1f24..3ad789cb 100644
--- a/lcls-twincat-motion/Library/Library.plcproj
+++ b/lcls-twincat-motion/Library/Library.plcproj
@@ -17,7 +17,7 @@
     <CombineIds>false</CombineIds>
     <Company>SLAC</Company>
     <Released>false</Released>
-    <Title>lcls-twincat-motion</Title>
+    <Title>lcls-twincat-motion-nrw</Title>
     <ProjectVersion>0.0.0</ProjectVersion>
     <WriteProductVersion>false</WriteProductVersion>
     <!--    <OutputType>Exe</OutputType>
diff --git a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_MotionReadPMPSDBND.TcPOU b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_MotionReadPMPSDBND.TcPOU
index 45789998..80dcada4 100644
--- a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_MotionReadPMPSDBND.TcPOU
+++ b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_MotionReadPMPSDBND.TcPOU
@@ -31,6 +31,10 @@ VAR_INPUT
     sDeviceName: STRING;
     // For debug: set this to TRUE in online mode to read the database immediately.
     bReadNow: BOOL;
+    // Set this to FALSE to load PMPS parameters locally
+    bUsePmpsDB: BOOL := TRUE;
+    // Local PMPSDB parameteres
+    astManualDbStateParams:  ARRAY[0..GeneralConstants.MAX_STATES] OF ST_DbStateParams;
 END_VAR
 VAR_OUTPUT
     // The raw lookup results from this FB. Index 0 is the transition beam, the rest of the indices match the state positions.
@@ -58,11 +62,15 @@ VAR
     sTempBackfill: STRING;
 END_VAR]]></Declaration>
     <Implementation>
-      <ST><![CDATA[
-SelectLookupKeys();
-ReadDatabase();
-RunFastFaults();
-BackfillInfo();
+      <ST><![CDATA[IF bUsePmpsDB THEN
+    SelectLookupKeys();
+    ReadDatabase();
+    RunFastFaults();
+    BackfillInfo();
+ELSE
+    astDbStateParams:=astManualDbStateParams;
+END_IF
+
 ]]></ST>
     </Implementation>
     <Action Name="BackfillInfo" Id="{da77ffc7-a50e-48a0-9b32-806e7f647a44}">
diff --git a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS1D.TcPOU b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS1D.TcPOU
index d950a267..75d5d80e 100644
--- a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS1D.TcPOU
+++ b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS1D.TcPOU
@@ -58,6 +58,10 @@ VAR_INPUT
     stPMPSEpicsToPlc: ST_StatePMPSEpicsToPlc;
     // Set this to TRUE to re-read the loaded database immediately (useful for debug)
     bReadDBNow: BOOL;
+    // Set this to FALSE to load PMPS parameters locally
+    bUsePmpsDB: BOOL := TRUE;
+    // Local PMPSDB parameteres
+    astManualDbStateParams:  ARRAY[0..GeneralConstants.MAX_STATES] OF ST_DbStateParams;
 END_VAR
 VAR_OUTPUT
     // Normal EPICS outputs, gathered into a single struct
@@ -109,6 +113,8 @@ fbPMPSCore(
     nCurrGoal:=fbCore.nCurrGoal,
     bReadDBNow:=bReadDBNow,
     stDbStateParams=>stDbStateParams,
+    bUsePmpsDB:=bUsePmpsDB,
+    astManualDbStateParams:=astManualDbStateParams,
 );
 
 stMotionStage := astMotionStageMax[1];
diff --git a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS2D.TcPOU b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS2D.TcPOU
index f8579104..de19a36b 100644
--- a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS2D.TcPOU
+++ b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS2D.TcPOU
@@ -67,6 +67,10 @@ VAR_INPUT
     stPMPSEpicsToPlc: ST_StatePMPSEpicsToPlc;
     // Set this to TRUE to re-read the loaded database immediately (useful for debug)
     bReadDBNow: BOOL;
+    // Set this to FALSE to load PMPS parameters locally
+    bUsePmpsDB: BOOL := TRUE;
+    // Local PMPSDB parameteres
+    astManualDbStateParams:  ARRAY[0..GeneralConstants.MAX_STATES] OF ST_DbStateParams;
 END_VAR
 VAR_OUTPUT
     // Normal EPICS outputs, gathered into a single struct
@@ -120,6 +124,8 @@ fbPMPSCore(
     nCurrGoal:=fbCore.nCurrGoal,
     bReadDBNow:=bReadDBNow,
     stDbStateParams=>stDbStateParams,
+    bUsePmpsDB:=bUsePmpsDB,
+    astManualDbStateParams:=astManualDbStateParams,
 );
 
 stMotionStage1 := astMotionStageMax[1];
diff --git a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS3D.TcPOU b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS3D.TcPOU
index 8a63f222..fa7face5 100644
--- a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS3D.TcPOU
+++ b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPS3D.TcPOU
@@ -76,6 +76,10 @@ VAR_INPUT
     stPMPSEpicsToPlc: ST_StatePMPSEpicsToPlc;
     // Set this to TRUE to re-read the loaded database immediately (useful for debug)
     bReadDBNow: BOOL;
+    // Set this to FALSE to load PMPS parameters locally
+    bUsePmpsDB: BOOL := TRUE;
+    // Local PMPSDB parameteres
+    astManualDbStateParams:  ARRAY[0..GeneralConstants.MAX_STATES] OF ST_DbStateParams;
 END_VAR
 VAR_OUTPUT
     // Normal EPICS outputs, gathered into a single struct
@@ -131,6 +135,8 @@ fbPMPSCore(
     nCurrGoal:=fbCore.nCurrGoal,
     bReadDBNow:=bReadDBNow,
     stDbStateParams=>stDbStateParams,
+    bUsePmpsDB:=bUsePmpsDB,
+    astManualDbStateParams:=astManualDbStateParams,
 );
 
 stMotionStage1 := astMotionStageMax[1];
diff --git a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPSND_Core.TcPOU b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPSND_Core.TcPOU
index 818ecb77..f3f5212d 100644
--- a/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPSND_Core.TcPOU
+++ b/lcls-twincat-motion/Library/POUs/Motion/PMPS/FB_PositionStatePMPSND_Core.TcPOU
@@ -44,6 +44,10 @@ VAR_INPUT
     nCurrGoal: UINT;
     // Set this to TRUE to re-read the loaded database immediately (useful for debug)
     bReadDBNow: BOOL;
+    // Set this to FALSE to load PMPS parameters locally
+    bUsePmpsDB: BOOL := TRUE;
+    // Local PMPSDB parameteres
+    astManualDbStateParams:  ARRAY[0..GeneralConstants.MAX_STATES] OF ST_DbStateParams;
 END_VAR
 VAR_OUTPUT
     // The PMPS database lookup associated with the current position state.
@@ -72,15 +76,29 @@ ELSE
     eStatePMPSStatus := E_StatePMPSStatus.TRANSITION;
 END_IF
 
-fbMotionReadPMPSDB(
-    astPositionState:=astPositionStateMax,
-    fbFFHWO:=fbFFHWO,
-    sTransitionKey:=sTransitionKey,
-    sDeviceName:=sDeviceName,
-    bReadNow:=bReadDBNow,
-    astDbStateParams=>,
-    bError=>,
-);
+IF bUsePmpsDB THEN
+    fbMotionReadPMPSDB(
+        astPositionState:=astPositionStateMax,
+        fbFFHWO:=fbFFHWO,
+        sTransitionKey:=sTransitionKey,
+        sDeviceName:=sDeviceName,
+        bReadNow:=bReadDBNow,
+        astDbStateParams=>,
+        bError=>,
+    );
+ELSE
+        fbMotionReadPMPSDB(
+        astPositionState:=astPositionStateMax,
+        fbFFHWO:=fbFFHWO,
+        sTransitionKey:=sTransitionKey,
+        sDeviceName:=sDeviceName,
+        bReadNow:=bReadDBNow,
+        astDbStateParams=>,
+        bError=>,
+        astManualDbStateParams:=astManualDbStateParams,
+        bUsePmpsDB:=bUsePmpsDB,
+    );
+END_IF
 
 fbMotionBPTM(
     astMotionStage:=astMotionStageMax,
diff --git a/lcls-twincat-motion/Library/Version/Global_Version.TcGVL b/lcls-twincat-motion/Library/Version/Global_Version.TcGVL
index 037341e2..379f5e65 100644
--- a/lcls-twincat-motion/Library/Version/Global_Version.TcGVL
+++ b/lcls-twincat-motion/Library/Version/Global_Version.TcGVL
@@ -7,7 +7,7 @@
 // This function has been automatically generated from the project information.
 VAR_GLOBAL CONSTANT
     {attribute 'const_non_replaced'}
-    stLibVersion_lcls_twincat_motion : ST_LibVersion := (iMajor := 0, iMinor := 0, iBuild := 0, iRevision := 0, nFlags := 0, sVersion := '0.0.0');
+    stLibVersion_lcls_twincat_motion_nrw : ST_LibVersion := (iMajor := 0, iMinor := 0, iBuild := 0, iRevision := 0, nFlags := 0, sVersion := '0.0.0');
 END_VAR
 ]]></Declaration>
   </GVL>
diff --git a/lcls-twincat-motion/_Config/PLC/Library.xti b/lcls-twincat-motion/_Config/PLC/Library.xti
index dd51a693..c677c32a 100644
--- a/lcls-twincat-motion/_Config/PLC/Library.xti
+++ b/lcls-twincat-motion/_Config/PLC/Library.xti
@@ -983,7 +983,7 @@ External Setpoint Generation:
 		</DataType>
 	</DataTypes>
 	<Project GUID="{E61EF94A-CFE8-4DDF-B7C9-5F7AD2CF9D83}" Name="Library" PrjFilePath="..\..\Library\Library.plcproj" TmcFilePath="..\..\Library\Library.tmc" ReloadTmc="true" AmsPort="851" FileArchiveSettings="#x000e">
-		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Library\Library.tmc" TmcHash="{0C997D26-FEC1-46B4-2438-632FFA910317}">
+		<Instance Id="#x08502000" TcSmClass="TComPlcObjDef" KeepUnrestoredLinks="2" TmcPath="Library\Library.tmc" TmcHash="{9E14035E-8A52-F1A5-AC38-B76DFBAADB32}">
 			<Name>Library Instance</Name>
 			<CLSID ClassFactory="TcPlc30">{08500001-0000-0000-F000-000000000064}</CLSID>
 			<Vars VarGrpType="1">