diff --git a/NWPRTXPS/NWPRTXPS-IOC-01App/Db/motor.substitutions b/NWPRTXPS/NWPRTXPS-IOC-01App/Db/motor.substitutions
index 0bb4e8783..a6076e640 100644
--- a/NWPRTXPS/NWPRTXPS-IOC-01App/Db/motor.substitutions
+++ b/NWPRTXPS/NWPRTXPS-IOC-01App/Db/motor.substitutions
@@ -1,6 +1,6 @@
 file $(MOTOR)/motorApp/Db/basic_asyn_motor.db {
     pattern {P,    M,         ADDR, DTYP,      PORT, DESC,   EGU,  VELO,  VBAS, ACCL, BDST, BVEL, BACC,    MRES,    ERES,  PREC, DHLM, DLLM, INIT, DIR}
-         {"\$(P)", "\$(M)", 0, "asynMotor", "\$(XPS_PORT)", "DESC",    "mm",   "100",   "0",  "1",    0,    1,   0,   "\$(MRES)",   "\$(ERES)",    3,   "360",   "0",  "", "Pos"}
+         {"\$(P)", "\$(M)", 0, "asynMotor", "\$(XPS_PORT)\$(CARD)", "DESC",    "mm",   "100",   "0",  "1",    0,    1,   0,   "\$(MRES)",   "\$(ERES)",    3,   "360",   "0",  "", "Pos"}
 }
 
 file "$(MOTOR)/db/XPS_extra.db"{
diff --git a/NWPRTXPS/NWPRTXPS-IOC-01App/src/build.mak b/NWPRTXPS/NWPRTXPS-IOC-01App/src/build.mak
index c6fae059b..74123fe28 100644
--- a/NWPRTXPS/NWPRTXPS-IOC-01App/src/build.mak
+++ b/NWPRTXPS/NWPRTXPS-IOC-01App/src/build.mak
@@ -72,11 +72,6 @@ $(APPNAME)_SRCS_vxWorks += -nil-
 #$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary
 
 # Finally link to the EPICS Base libraries
-## area detector already includes PVA, so avoid including it twice
-ifeq ($(AREA_DETECTOR),)
-include $(CONFIG)/CONFIG_PVA_ISIS
-endif
-
 $(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS)
 
 #===========================
diff --git a/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/config.xml b/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/config.xml
index 3f1594e64..782271988 100644
--- a/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/config.xml
+++ b/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/config.xml
@@ -10,8 +10,10 @@
 
 <macro name="AXIS1_ID" pattern="^.*[.].*$" description="The ID of the axis as set in the controller, looks like Group1.Axis1. Leave blank for no axis (default: )" defaultValue="" hasDefault="YES" />
 <macro name="AXIS2_ID" pattern="^.*[.].*$" description="The ID of the axis as set in the controller, looks like Group1.Axis1. Leave blank for no axis (default: )" defaultValue="" hasDefault="YES" />
+<!--
 <macro name="AXIS3_ID" pattern="^.*[.].*$" description="The ID of the axis as set in the controller, looks like Group1.Axis1. Leave blank for no axis (default: )" defaultValue="" hasDefault="YES" />
 <macro name="AXIS4_ID" pattern="^.*[.].*$" description="The ID of the axis as set in the controller, looks like Group1.Axis1. Leave blank for no axis (default: )" defaultValue="" hasDefault="YES" />
+-->
 
 </macros>
 <pvsets>
diff --git a/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-common.cmd b/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-common.cmd
index 82472525c..8d4134158 100644
--- a/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-common.cmd
+++ b/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-common.cmd
@@ -24,10 +24,13 @@ $(IFSIM) drvAsynSerialPortConfigure("$(XPS_PORT)", "NUL", 0, 1)
 $(IFSIM) motorSimCreateController("motorSim", $(NAXES))
 $(IFSIM) epicsEnvSet("SIMSFX","Sim")
 
-$(IFNOTSIM) XPSSetup(1)
+$(IFNOTSIM) XPSSetup(2)
 $(IFNOTSIM) XPSConfig(0, "$(IP_ADDRESS)", $(IP_PORT), $(NAXES), $(MOVING_POLL), $(IDLE_POLL))
-$(IFNOTSIM) drvAsynMotorConfigure("$(XPS_PORT)", "motorXPS", 0, 1)
-$(IFNOTSIM) XPSInterpose("$(XPS_PORT)")
+$(IFNOTSIM) XPSConfig(1, "$(IP_ADDRESS)", $(IP_PORT), $(NAXES), $(MOVING_POLL), $(IDLE_POLL))
+$(IFNOTSIM) drvAsynMotorConfigure("$(XPS_PORT)00", "motorXPS", 0, 1)
+$(IFNOTSIM) drvAsynMotorConfigure("$(XPS_PORT)01", "motorXPS", 1, 1)
+$(IFNOTSIM) XPSInterpose("$(XPS_PORT)00")
+$(IFNOTSIM) XPSInterpose("$(XPS_PORT)01")
 
 iocshCmdLoop("< st-axes.cmd", "MN=\$(I)", "I", 1, 4)
 
@@ -46,6 +49,10 @@ dbLoadRecords("$(MOTOR)/db/motorUtil.db","P=$(MYPVPREFIX)$(IOCNAME):,$(IFIOC)= ,
 
 ## per controller PVs
 dbLoadRecords("$(MOTOR)/db/motorController.db","P=$(MYPVPREFIX),Q=MOT:MTR$(MTRCTRL):")
+#asynSetTraceIOMask("$(XPS_PORT)00", -1, 0x2)
+#asynSetTraceMask("$(XPS_PORT)00", -1, 0x9)
+#asynSetTraceIOMask("$(XPS_PORT)01", -1, 0x2)
+#asynSetTraceMask("$(XPS_PORT)01", -1, 0x9)
 
 iocInit()
 
diff --git a/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-motor.cmd b/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-motor.cmd
index 01e61d20f..f3f0cca9c 100644
--- a/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-motor.cmd
+++ b/NWPRTXPS/iocBoot/iocNWPRTXPS-IOC-01/st-motor.cmd
@@ -13,5 +13,5 @@ $(IFSIM) motorSimConfigAxis("motorSim", $(CARD), 200, -200, -200, 0)
 dcalc("ERES", "1.0/$(STEP_NUM)", 1, 12)
 dcalc("MRES", "1.0/$(STEP_NUM)", 1, 12)
 
-dbLoadRecords("$(TOP)/db/motor$(SIMSFX=).db", "P=$(MYPVPREFIX),M=$(AMOTORPV),XPS_PORT=$(XPS_PORT),MRES=$(MRES),ERES=$(ERES),CARD=$(CARD)")
+dbLoadRecords("$(TOP)/db/motor$(SIMSFX=).db", "P=$(MYPVPREFIX),M=$(AMOTORPV),XPS_PORT=$(XPS_PORT)$(CARD),MRES=$(MRES),ERES=$(ERES),CARD=$(CARD)")
 dbLoadRecords("$(MOTOR)/db/motorStatus.db", "P=$(MYPVPREFIX),M=$(AMOTORPV),IOCNAME=$(IOCNAME)")