diff --git a/Packages/Kernel/Globals/14.4+TASKS.zwr b/Packages/Kernel/Globals/14.4+TASKS.zwr
index adfffed3538..5aa4e9a955d 100644
--- a/Packages/Kernel/Globals/14.4+TASKS.zwr
+++ b/Packages/Kernel/Globals/14.4+TASKS.zwr
@@ -1,6 +1,6 @@
 OSEHRA ZGO Export: TASKS
-23-MAY-2019 06:59:19 ZWR
-^%ZTSK(-1)=4947
+23-MAY-2019 08:22:31 ZWR
+^%ZTSK(-1)=4951
 ^%ZTSK(0)="TASKS^14.4^4344"
 ^%ZTSK(1001,0)="TASK^XMXBULL^16^^63957,36927^63957,36927^R^^^PATCH,USER^PLA^PLA^ZTDESC^^"
 ^%ZTSK(1001,.02)="^PLA^^"
@@ -46979,6 +46979,47 @@ OSEHRA ZGO Export: TASKS
 ^%ZTSK(4947,.3,"DUZ(",0)="@"
 ^%ZTSK(4947,.3,"XQSCH")=8
 ^%ZTSK(4947,.3,"XQY")=9891
+^%ZTSK(4948,0)="HOUR^XUTMHR^.5^^65156,29848^65156,29848^R^^^POSTMASTER^VISTA^VISTA^ZTDESC^^"
+^%ZTSK(4948,.02)="^VISTA^^"
+^%ZTSK(4948,.03)="Taskman Hourly Job"
+^%ZTSK(4948,.04)=5629508248
+^%ZTSK(4948,.1)="B^65156,29908^Task's volume set not listed in index.^^^^^^"
+^%ZTSK(4948,.2)=""
+^%ZTSK(4948,.21)=""
+^%ZTSK(4948,.25)=""
+^%ZTSK(4949,0)="ZTSK^XQ1^.5^VISTA^65156,29908^65156,29908^O^8853^HL AUTOSTART LINK MANAGER^POSTMASTER^VISTA^VISTA^ZTDESC^VISTA^"
+^%ZTSK(4949,.02)="^VISTA^^"
+^%ZTSK(4949,.03)="No Description (%ZTLOAD)"
+^%ZTSK(4949,.04)=5629508308
+^%ZTSK(4949,.1)="B^65156,29910^Task's volume set not listed in index.^^^^^^"
+^%ZTSK(4949,.2)=""
+^%ZTSK(4949,.21)=""
+^%ZTSK(4949,.25)=""
+^%ZTSK(4949,.3,"DUZ(",0)="@"
+^%ZTSK(4949,.3,"XQSCH")=10
+^%ZTSK(4949,.3,"XQY")=8853
+^%ZTSK(4950,0)="ZTSK^XQ1^.5^VISTA^65156,29908^65156,29908^O^8412^HL TASK RESTART^POSTMASTER^VISTA^VISTA^ZTDESC^VISTA^"
+^%ZTSK(4950,.02)="^VISTA^^"
+^%ZTSK(4950,.03)="No Description (%ZTLOAD)"
+^%ZTSK(4950,.04)=5629508308
+^%ZTSK(4950,.1)="B^65156,29912^Task's volume set not listed in index.^^^^^^"
+^%ZTSK(4950,.2)=""
+^%ZTSK(4950,.21)=""
+^%ZTSK(4950,.25)=""
+^%ZTSK(4950,.3,"DUZ(",0)="@"
+^%ZTSK(4950,.3,"XQSCH")=11
+^%ZTSK(4950,.3,"XQY")=8412
+^%ZTSK(4951,0)="ZTSK^XQ1^.5^VISTA^65156,29908^65156,29908^O^9891^XOBV LISTENER STARTUP^POSTMASTER^VISTA^VISTA^ZTDESC^VISTA^"
+^%ZTSK(4951,.02)="^VISTA^^"
+^%ZTSK(4951,.03)="No Description (%ZTLOAD)"
+^%ZTSK(4951,.04)=5629508308
+^%ZTSK(4951,.1)="B^65156,29914^Task's volume set not listed in index.^^^^^^"
+^%ZTSK(4951,.2)=""
+^%ZTSK(4951,.21)=""
+^%ZTSK(4951,.25)=""
+^%ZTSK(4951,.3,"DUZ(",0)="@"
+^%ZTSK(4951,.3,"XQSCH")=8
+^%ZTSK(4951,.3,"XQY")=9891
 ^%ZTSK(1082462,.1)="E^64013,39495^Interrupted While Running"
 ^%ZTSK(1082463,.1)="E^64013,39495^Interrupted While Running"
 ^%ZTSK(1082464,.1)="E^64013,39495^Interrupted While Running"
diff --git a/Packages/Kernel/Globals/9.4+PACKAGE.zwr b/Packages/Kernel/Globals/9.4+PACKAGE.zwr
index ee0893aaf18..72de69cb5e2 100644
--- a/Packages/Kernel/Globals/9.4+PACKAGE.zwr
+++ b/Packages/Kernel/Globals/9.4+PACKAGE.zwr
@@ -1,5 +1,5 @@
 OSEHRA ZGO Export: PACKAGE
-23-MAY-2019 06:59:21 ZWR
+23-MAY-2019 08:22:36 ZWR
 ^DIC(9.4,-1,"INI")="^2960819.165753"
 ^DIC(9.4,0)="PACKAGE^9.4I^232^144"
 ^DIC(9.4,0,"DD")="#"
@@ -187008,7 +187008,7 @@ OSEHRA ZGO Export: PACKAGE
 ^DIC(9.4,128,22,11,"PAH","B","31 SEQ #31",27)=""
 ^DIC(9.4,128,22,11,"PAH","B","56 SEQ #56",52)=""
 ^DIC(9.4,128,22,18,0)=2.2
-^DIC(9.4,128,22,18,"PAH",0)="^9.4901^7^7"
+^DIC(9.4,128,22,18,"PAH",0)="^9.4901^8^8"
 ^DIC(9.4,128,22,18,"PAH",1,0)="1^3140618.123416^17"
 ^DIC(9.4,128,22,18,"PAH",1,1,0)="^^1^1^3140618"
 ^DIC(9.4,128,22,18,"PAH",1,1,1,0)="Oncology version 2.2 and other fixes."
@@ -187025,12 +187025,14 @@ OSEHRA ZGO Export: PACKAGE
 ^DIC(9.4,128,22,18,"PAH",6,1,0)="^^1^1^3180103"
 ^DIC(9.4,128,22,18,"PAH",6,1,1,0)="ENTERING BUILD IN PACKAGE FILE WITHOUT INSTALLING"
 ^DIC(9.4,128,22,18,"PAH",7,0)="9^3180811.22534^17"
+^DIC(9.4,128,22,18,"PAH",8,0)="11^3190523.081838^17"
 ^DIC(9.4,128,22,18,"PAH","B",1,1)=""
 ^DIC(9.4,128,22,18,"PAH","B",4,2)=""
 ^DIC(9.4,128,22,18,"PAH","B",5,4)=""
 ^DIC(9.4,128,22,18,"PAH","B",6,6)=""
 ^DIC(9.4,128,22,18,"PAH","B",8,5)=""
 ^DIC(9.4,128,22,18,"PAH","B",9,7)=""
+^DIC(9.4,128,22,18,"PAH","B",11,8)=""
 ^DIC(9.4,128,22,18,"PAH","B","7 SEQ #3",3)=""
 ^DIC(9.4,128,22,"B",2.11,11)=""
 ^DIC(9.4,128,22,"B",2.2,18)=""
diff --git a/Packages/Kernel/Globals/9.6+BUILD.zwr b/Packages/Kernel/Globals/9.6+BUILD.zwr
index ba4f903723f..c1343bcb074 100644
--- a/Packages/Kernel/Globals/9.6+BUILD.zwr
+++ b/Packages/Kernel/Globals/9.6+BUILD.zwr
@@ -1,6 +1,6 @@
 OSEHRA ZGO Export: BUILD
-23-MAY-2019 07:01:39 ZWR
-^XPD(9.6,0)="BUILD^9.6I^11260^10900"
+23-MAY-2019 08:24:58 ZWR
+^XPD(9.6,0)="BUILD^9.6I^11261^10901"
 ^XPD(9.6,1,0)="KERNEL - VIRGIN INSTALL 8.0^3^0^2950703^n"
 ^XPD(9.6,1,1,0)="^^3^3^2950703^"
 ^XPD(9.6,1,1,1,0)="Install files needed to support Kernel 8.0.  This package is"
@@ -1216971,6 +1216971,74 @@ OSEHRA ZGO Export: BUILD
 ^XPD(9.6,11260,"REQB",0)="^9.611^1^1"
 ^XPD(9.6,11260,"REQB",1,0)="RMIM*1.0*8^2"
 ^XPD(9.6,11260,"REQB","B","RMIM*1.0*8",1)=""
+^XPD(9.6,11261,0)="ONC*2.2*11^128^0^3181106^y"
+^XPD(9.6,11261,4,0)="^9.64PA^^"
+^XPD(9.6,11261,6.3)=1
+^XPD(9.6,11261,"KRN",0)="^9.67PA^1.61^23"
+^XPD(9.6,11261,"KRN",.4,0)=.4
+^XPD(9.6,11261,"KRN",.4,"NM",0)="^9.68A^4^4"
+^XPD(9.6,11261,"KRN",.4,"NM",1,0)="ONCQA    FILE #165.5^165.5^0"
+^XPD(9.6,11261,"KRN",.4,"NM",2,0)="ONCQA1    FILE #165.5^165.5^0"
+^XPD(9.6,11261,"KRN",.4,"NM",3,0)="ONCQA2    FILE #165.5^165.5^0"
+^XPD(9.6,11261,"KRN",.4,"NM",4,0)="ONCQA3    FILE #165.5^165.5^0"
+^XPD(9.6,11261,"KRN",.4,"NM","B","ONCQA    FILE #165.5",1)=""
+^XPD(9.6,11261,"KRN",.4,"NM","B","ONCQA1    FILE #165.5",2)=""
+^XPD(9.6,11261,"KRN",.4,"NM","B","ONCQA2    FILE #165.5",3)=""
+^XPD(9.6,11261,"KRN",.4,"NM","B","ONCQA3    FILE #165.5",4)=""
+^XPD(9.6,11261,"KRN",.401,0)=.401
+^XPD(9.6,11261,"KRN",.402,0)=.402
+^XPD(9.6,11261,"KRN",.403,0)=.403
+^XPD(9.6,11261,"KRN",.5,0)=.5
+^XPD(9.6,11261,"KRN",.84,0)=.84
+^XPD(9.6,11261,"KRN",1.6,0)=1.6
+^XPD(9.6,11261,"KRN",1.61,0)=1.61
+^XPD(9.6,11261,"KRN",1.62,0)=1.62
+^XPD(9.6,11261,"KRN",3.6,0)=3.6
+^XPD(9.6,11261,"KRN",3.8,0)=3.8
+^XPD(9.6,11261,"KRN",9.2,0)=9.2
+^XPD(9.6,11261,"KRN",9.8,0)=9.8
+^XPD(9.6,11261,"KRN",9.8,"NM",0)="^9.68A^2^2"
+^XPD(9.6,11261,"KRN",9.8,"NM",1,0)="ONCOPA2A^^0^B20021874"
+^XPD(9.6,11261,"KRN",9.8,"NM",2,0)="ONCODIS^^0^B795013"
+^XPD(9.6,11261,"KRN",9.8,"NM","B","ONCODIS",2)=""
+^XPD(9.6,11261,"KRN",9.8,"NM","B","ONCOPA2A",1)=""
+^XPD(9.6,11261,"KRN",19,0)=19
+^XPD(9.6,11261,"KRN",19.1,0)=19.1
+^XPD(9.6,11261,"KRN",101,0)=101
+^XPD(9.6,11261,"KRN",409.61,0)=409.61
+^XPD(9.6,11261,"KRN",771,0)=771
+^XPD(9.6,11261,"KRN",779.2,0)=779.2
+^XPD(9.6,11261,"KRN",870,0)=870
+^XPD(9.6,11261,"KRN",8989.51,0)=8989.51
+^XPD(9.6,11261,"KRN",8989.52,0)=8989.52
+^XPD(9.6,11261,"KRN",8994,0)=8994
+^XPD(9.6,11261,"KRN","B",.4,.4)=""
+^XPD(9.6,11261,"KRN","B",.401,.401)=""
+^XPD(9.6,11261,"KRN","B",.402,.402)=""
+^XPD(9.6,11261,"KRN","B",.403,.403)=""
+^XPD(9.6,11261,"KRN","B",.5,.5)=""
+^XPD(9.6,11261,"KRN","B",.84,.84)=""
+^XPD(9.6,11261,"KRN","B",1.6,1.6)=""
+^XPD(9.6,11261,"KRN","B",1.61,1.61)=""
+^XPD(9.6,11261,"KRN","B",1.62,1.62)=""
+^XPD(9.6,11261,"KRN","B",3.6,3.6)=""
+^XPD(9.6,11261,"KRN","B",3.8,3.8)=""
+^XPD(9.6,11261,"KRN","B",9.2,9.2)=""
+^XPD(9.6,11261,"KRN","B",9.8,9.8)=""
+^XPD(9.6,11261,"KRN","B",19,19)=""
+^XPD(9.6,11261,"KRN","B",19.1,19.1)=""
+^XPD(9.6,11261,"KRN","B",101,101)=""
+^XPD(9.6,11261,"KRN","B",409.61,409.61)=""
+^XPD(9.6,11261,"KRN","B",771,771)=""
+^XPD(9.6,11261,"KRN","B",779.2,779.2)=""
+^XPD(9.6,11261,"KRN","B",870,870)=""
+^XPD(9.6,11261,"KRN","B",8989.51,8989.51)=""
+^XPD(9.6,11261,"KRN","B",8989.52,8989.52)=""
+^XPD(9.6,11261,"KRN","B",8994,8994)=""
+^XPD(9.6,11261,"QUES",0)="^9.62^^"
+^XPD(9.6,11261,"REQB",0)="^9.611^1^1"
+^XPD(9.6,11261,"REQB",1,0)="ONC*2.2*9^2"
+^XPD(9.6,11261,"REQB","B","ONC*2.2*9",1)=""
 ^XPD(9.6,"B","A4A7*1.01*10",1312)=""
 ^XPD(9.6,"B","A4A7*1.01*11",1900)=""
 ^XPD(9.6,"B","A4A7*1.01*9",339)=""
@@ -1221625,6 +1221693,7 @@ OSEHRA ZGO Export: BUILD
 ^XPD(9.6,"B","ONC*2.11*8",478)=""
 ^XPD(9.6,"B","ONC*2.11*9",568)=""
 ^XPD(9.6,"B","ONC*2.2*1",9610)=""
+^XPD(9.6,"B","ONC*2.2*11",11261)=""
 ^XPD(9.6,"B","ONC*2.2*4",9914)=""
 ^XPD(9.6,"B","ONC*2.2*5",10229)=""
 ^XPD(9.6,"B","ONC*2.2*6",10627)=""
@@ -1236152,6 +1236221,7 @@ OSEHRA ZGO Export: BUILD
 ^XPD(9.6,"C",128,10379)=""
 ^XPD(9.6,"C",128,10627)=""
 ^XPD(9.6,"C",128,10909)=""
+^XPD(9.6,"C",128,11261)=""
 ^XPD(9.6,"C",130,1083)=""
 ^XPD(9.6,"C",133,186)=""
 ^XPD(9.6,"C",133,187)=""
diff --git a/Packages/Kernel/Globals/9.7+INSTALL.zwr b/Packages/Kernel/Globals/9.7+INSTALL.zwr
index 729d26db9df..8e000d07498 100644
--- a/Packages/Kernel/Globals/9.7+INSTALL.zwr
+++ b/Packages/Kernel/Globals/9.7+INSTALL.zwr
@@ -1,6 +1,6 @@
 OSEHRA ZGO Export: INSTALL
-23-MAY-2019 07:02:01 ZWR
-^XPD(9.7,0)="INSTALL^9.7I^10979^10837"
+23-MAY-2019 08:25:23 ZWR
+^XPD(9.7,0)="INSTALL^9.7I^10980^10838"
 ^XPD(9.7,1,0)="KERNEL - VIRGIN INSTALL 8.0^^2960531.10393^1^1^^^^3^0^.5"
 ^XPD(9.7,1,1)="2960604.094043^2960604.094043^2960604.094047"
 ^XPD(9.7,1,2)="Kernel 8.0 from ISC-SF by RSD  ;Created on Jul 10, 1995@09:28:18"
@@ -843929,6 +843929,61 @@ OSEHRA ZGO Export: INSTALL
 ^XPD(9.7,10979,"QUES","B","XPI1",2)=""
 ^XPD(9.7,10979,"QUES","B","XPO1",1)=""
 ^XPD(9.7,10979,"QUES","B","XPZ1",3)=""
+^XPD(9.7,10980,0)="ONC*2.2*11^128^3190523.081832^10980^1^^0^0ONC*2.2*11^3^0^17"
+^XPD(9.7,10980,1)="3190523.081838^3190523.081838^3190523.081838^3181106"
+^XPD(9.7,10980,2)="Oncology Patch ONC*2.2*11  ;Created on Nov 06, 2018@08:49:42"
+^XPD(9.7,10980,6)=""
+^XPD(9.7,10980,"INI",0)="^9.713^1^1"
+^XPD(9.7,10980,"INI",1,0)="XPD PREINSTALL COMPLETED^3190523.081838"
+^XPD(9.7,10980,"INI","B","XPD PREINSTALL COMPLETED",1)=""
+^XPD(9.7,10980,"INIT",0)="^9.716^1^1"
+^XPD(9.7,10980,"INIT",1,0)="XPD POSTINSTALL COMPLETED^3190523.081838"
+^XPD(9.7,10980,"INIT","B","XPD POSTINSTALL COMPLETED",1)=""
+^XPD(9.7,10980,"KRN",0)="^9.715P^.4^1"
+^XPD(9.7,10980,"KRN",.4,0)=".4^3190523.081838^5"
+^XPD(9.7,10980,"KRN","AC",5,.4)=""
+^XPD(9.7,10980,"KRN","B",.4,.4)=""
+^XPD(9.7,10980,"MES",0)="^^24^24^3190523"
+^XPD(9.7,10980,"MES",1,0)=" "
+^XPD(9.7,10980,"MES",2,0)=" Install Started for ONC*2.2*11 : "
+^XPD(9.7,10980,"MES",3,0)="               May 23, 2019@08:18:38"
+^XPD(9.7,10980,"MES",4,0)=" "
+^XPD(9.7,10980,"MES",5,0)="Build Distribution Date: Nov 06, 2018"
+^XPD(9.7,10980,"MES",6,0)=" "
+^XPD(9.7,10980,"MES",7,0)=" Installing Routines:"
+^XPD(9.7,10980,"MES",8,0)="               May 23, 2019@08:18:38"
+^XPD(9.7,10980,"MES",9,0)=" "
+^XPD(9.7,10980,"MES",10,0)=" Installing PACKAGE COMPONENTS: "
+^XPD(9.7,10980,"MES",11,0)=" "
+^XPD(9.7,10980,"MES",12,0)=" Installing PRINT TEMPLATE"
+^XPD(9.7,10980,"MES",13,0)="               May 23, 2019@08:18:38"
+^XPD(9.7,10980,"MES",14,0)=" "
+^XPD(9.7,10980,"MES",15,0)=" Updating Routine file..."
+^XPD(9.7,10980,"MES",16,0)=" "
+^XPD(9.7,10980,"MES",17,0)=" Updating KIDS files..."
+^XPD(9.7,10980,"MES",18,0)=" "
+^XPD(9.7,10980,"MES",19,0)=" ONC*2.2*11 Installed. "
+^XPD(9.7,10980,"MES",20,0)="               May 23, 2019@08:18:38"
+^XPD(9.7,10980,"MES",21,0)=" "
+^XPD(9.7,10980,"MES",22,0)=" Not a production UCI"
+^XPD(9.7,10980,"MES",23,0)=" "
+^XPD(9.7,10980,"MES",24,0)=" NO Install Message sent "
+^XPD(9.7,10980,"QUES",0)="^9.701^2^2"
+^XPD(9.7,10980,"QUES",1,0)="XPI1"
+^XPD(9.7,10980,"QUES",1,1)=0
+^XPD(9.7,10980,"QUES",1,"A")="Want KIDS to INHIBIT LOGONs during the install"
+^XPD(9.7,10980,"QUES",1,"B")="NO"
+^XPD(9.7,10980,"QUES",2,0)="XPZ1"
+^XPD(9.7,10980,"QUES",2,1)=0
+^XPD(9.7,10980,"QUES",2,"A")="Want to DISABLE Scheduled Options, Menu Options, and Protocols"
+^XPD(9.7,10980,"QUES",2,"B")="NO"
+^XPD(9.7,10980,"QUES","B","XPI1",1)=""
+^XPD(9.7,10980,"QUES","B","XPZ1",2)=""
+^XPD(9.7,10980,"RTN",0)="^9.704A^2^2"
+^XPD(9.7,10980,"RTN",1,0)="ONCODIS"
+^XPD(9.7,10980,"RTN",2,0)="ONCOPA2A"
+^XPD(9.7,10980,"RTN","B","ONCODIS",1)=""
+^XPD(9.7,10980,"RTN","B","ONCOPA2A",2)=""
 ^XPD(9.7,"ASP",1,1,1)=""
 ^XPD(9.7,"ASP",1,2,2)=""
 ^XPD(9.7,"ASP",3,1,3)=""
@@ -854766,6 +854821,7 @@ OSEHRA ZGO Export: INSTALL
 ^XPD(9.7,"ASP",10977,1,10977)=""
 ^XPD(9.7,"ASP",10978,1,10978)=""
 ^XPD(9.7,"ASP",10979,1,10979)=""
+^XPD(9.7,"ASP",10980,1,10980)=""
 ^XPD(9.7,"B","A4A7*1.01*10",1037)=""
 ^XPD(9.7,"B","A4A7*1.01*11",1611)=""
 ^XPD(9.7,"B","A4A7*1.01*11",1631)=""
@@ -859340,6 +859396,7 @@ OSEHRA ZGO Export: INSTALL
 ^XPD(9.7,"B","ONC*2.11*8",492)=""
 ^XPD(9.7,"B","ONC*2.11*9",581)=""
 ^XPD(9.7,"B","ONC*2.2*1",9310)=""
+^XPD(9.7,"B","ONC*2.2*11",10980)=""
 ^XPD(9.7,"B","ONC*2.2*4",9618)=""
 ^XPD(9.7,"B","ONC*2.2*5",9936)=""
 ^XPD(9.7,"B","ONC*2.2*6",10335)=""
diff --git a/Packages/Oncology/Routines/ONCODIS.m b/Packages/Oncology/Routines/ONCODIS.m
index 097b7454bee..41975818809 100644
--- a/Packages/Oncology/Routines/ONCODIS.m
+++ b/Packages/Oncology/Routines/ONCODIS.m
@@ -1,5 +1,5 @@
 ONCODIS ;Hines OIFO/GWB - OncoTrax Banner ;09/13/11
- ;;2.2;ONCOLOGY;**1,4,7,5,8,6,9**;Jul 31, 2013;Build 3
+ ;;2.2;ONCOLOGY;**1,4,7,5,8,6,9,11**;Jul 31, 2013;Build 1
  ;
 MAIN ;OncoTrax Banner
  S RC=$$CHKVER^ONCSAPIV()
@@ -10,7 +10,7 @@
 LOGO ;Display banner
  W @IOF W !!!!!! F I=1:1:9 W !,?22,$P($T(DISP+I),";",3)
  W !!,?22,"Department of Veterans Affairs"
- W !?22,"OncoTraX V2.2 P9 Test Build #3" Q
+ W !?22,"OncoTraX V2.2 Patch 11" Q
 DISP ;
  ;;VVVV            VVAA
  ;; VVVV          VVAAAA
diff --git a/Packages/Oncology/Routines/ONCOPA2A.m b/Packages/Oncology/Routines/ONCOPA2A.m
index e0b0ae598ed..cf6c516fb48 100644
--- a/Packages/Oncology/Routines/ONCOPA2A.m
+++ b/Packages/Oncology/Routines/ONCOPA2A.m
@@ -1,5 +1,5 @@
 ONCOPA2A ;Hines OIFO/RTK [PA Print Complete Abstract (132c)]; 09/05/97
- ;;2.2;ONCOLOGY;**1**;Jul 31, 2013;Build 8
+ ;;2.2;ONCOLOGY;**1,11**;Jul 31, 2013;Build 1
  ; ONCO PRINT ABSTRACT CONTINUED
  W !!,"   Text-Remarks:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,19,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,19,TX,0) D P Q:EX=U
  W !,"   Text Dx Proc-Phys.Exam:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,10,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,10,TX,0) D P Q:EX=U
@@ -8,6 +8,8 @@
  W !,"   Text Dx Proc-Lab Tests:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,22,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,22,TX,0) D P Q:EX=U
  W !,"   Text Dx Proc-Endoscopy:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,12,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,12,TX,0) D P Q:EX=U
  W !,"   Text Dx Proc-Path/Cyto:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,13,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,13,TX,0) D P Q:EX=U
+ W !,"   Text Staging:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,22.1,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,22.1,TX,0) D P Q:EX=U
+ W !,"   Text Site Specific Data Items:  " F TX=0:0 S TX=$O(^ONCO(165.5,IEN,22.2,TX)) Q:TX'>0  W !?6,^ONCO(165.5,IEN,22.2,TX,0) D P Q:EX=U
  ;
  S NAME="RECURRENCES" D FORMAT^ONCOPA1
  W !!,TITLE
diff --git a/Packages/VA FileMan/Globals/0.4+PRINT TEMPLATE.zwr b/Packages/VA FileMan/Globals/0.4+PRINT TEMPLATE.zwr
index 11b2625df27..fa476d463eb 100644
--- a/Packages/VA FileMan/Globals/0.4+PRINT TEMPLATE.zwr	
+++ b/Packages/VA FileMan/Globals/0.4+PRINT TEMPLATE.zwr	
@@ -1,5 +1,5 @@
 OSEHRA ZGO Export: PRINT TEMPLATE
-19-MAY-2019 07:07:05 ZWR
+23-MAY-2019 08:22:34 ZWR
 ^DIPT(0)="PRINT TEMPLATE^.4I^1567^1269"
 ^DIPT(.01,0)="CAPTIONED^"
 ^DIPT(.01,"F",1)="S DIC=DCC,DA=D0 D EN^DIQ"
@@ -14498,13 +14498,12 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1430,"F",9)="-410,X DXS(3,9.2) S X=$P(DIP(201),U,1) S D0=I(100,0) W X K DIP;L4;C1;"" "";Z;""SUB AUTHORITY:AUTHORITY CODE""~"
 ^DIPT(1430,"F",10)="-410,X DXS(4,9.2) S X=$P(DIP(201),U,2) S D0=I(100,0) W X K DIP;L70;""SUB-AUTHORITY"";C6;Z;""SUB AUTHORITY:AUTHORITY DESCRIPTION""~""  "";C1~"
 ^DIPT(1430,"H")="PROCUREMENT & ACCOUNTING TRANSACTIONS LIST (OBLIGATED 1358s)"
-^DIPT(1431,0)="ONCQA^3111027.1039^@^165.5^^@^3111027"
-^DIPT(1431,"DXS")=7
+^DIPT(1431,0)="ONCQA^3181105.0952^@^165.5^^@^3181105"
 ^DIPT(1431,"DXS",1,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,7)):^(7),1:"""") S X=$P($G(^VA(200,+$P(DIP(1),U,3),0)),U)"
 ^DIPT(1431,"DXS",2,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.5,.03,"""",$P(DIP(1),U,3))"
 ^DIPT(1431,"DXS",3,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:"""") S X=$P($G(^ONCO(164,+$P(DIP(1),U,1),0)),U)"
 ^DIPT(1431,"DXS",4,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2.2)):^(2.2),1:"""") S X=$P($G(^ONCO(169.3,+$P(DIP(1),U,3),0)),U)"
-^DIPT(1431,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
+^DIPT(1431,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S D0=D0 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
 ^DIPT(1431,"DXS",6,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,4,D1,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.51,2,"""",$P(DIP(1),U,3))"
 ^DIPT(1431,"F",1)="""CANCER REGISTRY QA ABSTRACT"";C3;S1~N %I,%H,% D NOW^%DTC S X=% S X=X,X=$P(X,""."",1) S Y=X D DT K DIP;C65;L12;d;Z;""DATE(NOW)""~"
 ^DIPT(1431,"F",2)="""Abstracted by.................:"";C3;S1~"
@@ -14549,10 +14548,10 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1431,"F",41)="""Immunotherapy.................:"";C3~55;C35~55.2;C46;L34~""Hema Trans/Endocrine Proc.....:"";C3~153.1;C35~153;C46;L34~S X=X;Z;""S X=X""~"
 ^DIPT(1431,"F",42)="""Other Treatment...............:"";C3~57;C35~57.2;C46;L34~""* TEXT *"";S1~""Text-Remarks:"";C3;S1~113,.01;C3~""Text-DX Proc-PE:"";C3;S1~104,.01;C3~"
 ^DIPT(1431,"F",43)="""Text-DX Proc-X-ray/Scan:"";C3;S1~105,.01;C3~""Text-DX Proc-Scopes:"";C3;S1~106,.01;C3~""Text-DX Proc-Lab Tests:"";C3;S1~116,.01;C3~"
-^DIPT(1431,"F",44)="""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""* FOLLOW-UP *"";S1~S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~"
-^DIPT(1431,"F",45)="""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~""Distant Site 1................:"";C3~71.1;C35~""Distant Site 2................:"";C3~71.2;C35~"
-^DIPT(1431,"F",46)="""Distant Site 3................:"";C3~71.3;C35~""* SUBSEQUENT COURSE OF TREATMENT *"";S1~60,""Initiation Date...............:"";C3;S1~60,.01;C35~"
-^DIPT(1431,"F",47)="60,""Place.........................:"";C3~"
+^DIPT(1431,"F",44)="""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""Text-Staging:"";C3;S1~285,.01;C3~""Text-Site Specific Data Items:"";C3;S1~"
+^DIPT(1431,"F",45)="286,.01;C3~""* FOLLOW-UP *"";S1~S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~"
+^DIPT(1431,"F",46)="""Distant Site 1................:"";C3~71.1;C35~""Distant Site 2................:"";C3~71.2;C35~""Distant Site 3................:"";C3~71.3;C35~"
+^DIPT(1431,"F",47)="""* SUBSEQUENT COURSE OF TREATMENT *"";S1~60,""Initiation Date...............:"";C3;S1~60,.01;C35~60,""Place.........................:"";C3~"
 ^DIPT(1431,"F",48)="60,N DIERR X DXS(6,9.2) X ""F %=2:1:$L(X) I $E(X,%)?1U,$E(X,%-1)?1A S X=$E(X,0,%-1)_$C($A(X,%)+32)_$E(X,%+1,999)"" W X K DIP;C35;Z;""LOWERCASE(PLACE)""~"
 ^DIPT(1431,"F",49)="60,""Surgery of Primary Site.......:"";C3~60,.041;C35~60,.04;C46;L34~60,""Radiation.....................:"";C3~60,.051;C35~60,.05;C46;L34~"
 ^DIPT(1431,"F",50)="60,""Chemotherapy..................:"";C3~60,.061;C35~60,.06;C46;L34~60,""Hormone Therapy...............:"";C3~60,.071;C35~60,.07;C46;L34~"
@@ -14560,13 +14559,12 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1431,"F",52)="60,S X=X;Z;""S X=X""~60,""Other Treatment...............:"";C3~60,.091;C35~60,.09;C46;L34~"
 ^DIPT(1431,"H")="@"
 ^DIPT(1431,"SUB")=1
-^DIPT(1432,0)="ONCQA1^3111027.104^@^165.5^^@^3111122"
-^DIPT(1432,"DXS")=7
+^DIPT(1432,0)="ONCQA1^3181105.1114^@^165.5^^@^3181105"
 ^DIPT(1432,"DXS",1,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,7)):^(7),1:"""") S X=$P($G(^VA(200,+$P(DIP(1),U,3),0)),U)"
 ^DIPT(1432,"DXS",2,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.5,.03,"""",$P(DIP(1),U,3))"
 ^DIPT(1432,"DXS",3,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:"""") S X=$P($G(^ONCO(164,+$P(DIP(1),U,1),0)),U)"
 ^DIPT(1432,"DXS",4,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2.2)):^(2.2),1:"""") S X=$P($G(^ONCO(169.3,+$P(DIP(1),U,3),0)),U)"
-^DIPT(1432,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
+^DIPT(1432,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S D0=D0 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
 ^DIPT(1432,"DXS",6,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,4,D1,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.51,2,"""",$P(DIP(1),U,3))"
 ^DIPT(1432,"F",1)="""CANCER REGISTRY QA ABSTRACT"";C3;S1~N %I,%H,% D NOW^%DTC S X=% S X=X,X=$P(X,""."",1) S Y=X D DT K DIP;C65;L12;d;Z;""DATE(NOW)""~"
 ^DIPT(1432,"F",2)="""Abstracted by.................:"";C3;S1~"
@@ -14609,16 +14607,17 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1432,"F",39)="""Surgery of Primary............:"";C3;S1~50;C35~58.6;C46;L34~""Radiation.....................:"";C3~51;C35~51.2;C46~""Chemotherapy..................:"";C3~"
 ^DIPT(1432,"F",40)="53;C35~53.2;C46;L34~""Hormone Therapy...............:"";C3~54;C35~54.2;C46;L34~""Immunotherapy.................:"";C3~55;C35~55.2;C46;L34~"
 ^DIPT(1432,"F",41)="""Hema Trans/Endocrine Proc.....:"";C3~153.1;C35~153;C46;L34~S X=X;Z;""S X=X""~""Other Treatment...............:"";C3~57;C35~57.2;C46;L34~""* TEXT *"";S1~"
-^DIPT(1432,"F",42)="""Text-Remarks:"";C3;S1~113,.01;C3~""Text-DX Proc-PE:"";C3;S1~104,.01;C3~""Text-DX Proc-X-ray/Scan:"";C3;S1~105,.01;C3~""Text-DX Proc-Scopes:"";C3;S1~"
-^DIPT(1432,"F",43)="106,.01;C3~""Text-DX Proc-Lab Tests:"";C3;S1~116,.01;C3~""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""* FOLLOW-UP *"";S1~"
-^DIPT(1432,"F",44)="S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~""Distant Site 1................:"";C3~"
-^DIPT(1432,"F",45)="71.1;C35~""Distant Site 2................:"";C3~71.2;C35~""Distant Site 3................:"";C3~71.3;C35~""* SUBSEQUENT COURSE OF TREATMENT *"";S1~"
-^DIPT(1432,"F",46)="60,""Initiation Date...............:"";C3;S1~60,.01;C35~60,""Place.........................:"";C3~"
-^DIPT(1432,"F",47)="60,N DIERR X DXS(6,9.2) X ""F %=2:1:$L(X) I $E(X,%)?1U,$E(X,%-1)?1A S X=$E(X,0,%-1)_$C($A(X,%)+32)_$E(X,%+1,999)"" W X K DIP;C35;Z;""LOWERCASE(PLACE)""~"
-^DIPT(1432,"F",48)="60,""Surgery of Primary Site.......:"";C3~60,.041;C35~60,.04;C46;L34~60,""Radiation.....................:"";C3~60,.051;C35~60,.05;C46;L34~"
-^DIPT(1432,"F",49)="60,""Chemotherapy..................:"";C3~60,.061;C35~60,.06;C46;L34~60,""Hormone Therapy...............:"";C3~60,.071;C35~60,.07;C46;L34~"
-^DIPT(1432,"F",50)="60,""Immunotherapy.................:"";C3~60,.081;C35~60,.08;C46;L34~60,""Hema Trans/Endocrine Proc.....:"";C3~60,.021;C35~60,.02;C46;L34;X~"
-^DIPT(1432,"F",51)="60,S X=X;Z;""S X=X""~60,""Other Treatment...............:"";C3~60,.091;C35~60,.09;C46;L34~"
+^DIPT(1432,"F",42)="""Text-Remarks:"";C3;S1~113,.01;C3~""Text-DX Proc-PE:"";C3;S1~104,.01;C3~""Text-DX Proc-X-ray/Scan:"";C3;S1~105,.01;C3~""Text-DX Proc-Scopes:"";C3;S1~106,.01;C3~"
+^DIPT(1432,"F",43)="""Text-DX Proc-Lab Tests:"";C3;S1~116,.01;C3~""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""Text-Staging:"";C3;S1~285,.01;C3~"
+^DIPT(1432,"F",44)="""Text-Site Specific Data Items:"";C3;S1~286,.01;C3~""* FOLLOW-UP *"";S1~S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~"
+^DIPT(1432,"F",45)="""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~""Distant Site 1................:"";C3~71.1;C35~""Distant Site 2................:"";C3~71.2;C35~"
+^DIPT(1432,"F",46)="""Distant Site 3................:"";C3~71.3;C35~""* SUBSEQUENT COURSE OF TREATMENT *"";S1~60,""Initiation Date...............:"";C3;S1~60,.01;C35~"
+^DIPT(1432,"F",47)="60,""Place.........................:"";C3~"
+^DIPT(1432,"F",48)="60,N DIERR X DXS(6,9.2) X ""F %=2:1:$L(X) I $E(X,%)?1U,$E(X,%-1)?1A S X=$E(X,0,%-1)_$C($A(X,%)+32)_$E(X,%+1,999)"" W X K DIP;C35;Z;""LOWERCASE(PLACE)""~"
+^DIPT(1432,"F",49)="60,""Surgery of Primary Site.......:"";C3~60,.041;C35~60,.04;C46;L34~60,""Radiation.....................:"";C3~60,.051;C35~60,.05;C46;L34~"
+^DIPT(1432,"F",50)="60,""Chemotherapy..................:"";C3~60,.061;C35~60,.06;C46;L34~60,""Hormone Therapy...............:"";C3~60,.071;C35~60,.07;C46;L34~"
+^DIPT(1432,"F",51)="60,""Immunotherapy.................:"";C3~60,.081;C35~60,.08;C46;L34~60,""Hema Trans/Endocrine Proc.....:"";C3~60,.021;C35~60,.02;C46;L34;X~"
+^DIPT(1432,"F",52)="60,S X=X;Z;""S X=X""~60,""Other Treatment...............:"";C3~60,.091;C35~60,.09;C46;L34~"
 ^DIPT(1432,"H")="@"
 ^DIPT(1432,"SUB")=1
 ^DIPT(1433,0)="XIP STATE/COUNTY EXPORT^3050826.091^@^5^^@^3051101"
@@ -15577,13 +15576,12 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1523,"DXS",1,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^PRST(456,D0,0)):^(0),1:""""),D0=$P(DIP(1),U,1) S:'D0!'$D(^DIC(4,+D0,0)) D0=-1 S DIP(101)=$S($D(^DIC(4,D0,99)):^(99),1:"""")"
 ^DIPT(1523,"F",2)="0~.01~X DXS(1,9.2) S X=$P(DIP(101),U,1) S D0=I(0,0) W X K DIP;Z;""INSTITUTION:STATION""~5,.01~5,1~"
 ^DIPT(1523,"H")="PAID PARAMETERS LIST"
-^DIPT(1524,0)="ONCQA2^3111027.1041^^165.5^^^3111027^"
-^DIPT(1524,"DXS")=7
+^DIPT(1524,0)="ONCQA2^3181105.1116^^165.5^^^3181105"
 ^DIPT(1524,"DXS",1,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,7)):^(7),1:"""") S X=$P($G(^VA(200,+$P(DIP(1),U,3),0)),U)"
 ^DIPT(1524,"DXS",2,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.5,.03,"""",$P(DIP(1),U,3))"
 ^DIPT(1524,"DXS",3,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:"""") S X=$P($G(^ONCO(164,+$P(DIP(1),U,1),0)),U)"
 ^DIPT(1524,"DXS",4,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2.2)):^(2.2),1:"""") S X=$P($G(^ONCO(169.3,+$P(DIP(1),U,3),0)),U)"
-^DIPT(1524,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
+^DIPT(1524,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S D0=D0 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
 ^DIPT(1524,"DXS",6,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,4,D1,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.51,2,"""",$P(DIP(1),U,3))"
 ^DIPT(1524,"F",1)="""CANCER REGISTRY QA ABSTRACT"";C3;S1~N %I,%H,% D NOW^%DTC S X=% S X=X,X=$P(X,""."",1) S Y=X D DT K DIP;C65;L12;d;Z;""DATE(NOW)""~"
 ^DIPT(1524,"F",2)="""Abstracted by.................:"";C3;S1~"
@@ -15626,25 +15624,25 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1524,"F",39)="""Surgery of Primary............:"";C3;S1~50;C35~58.6;C46;L34~""Radiation.....................:"";C3~51;C35~51.2;C46~""Chemotherapy..................:"";C3~"
 ^DIPT(1524,"F",40)="53;C35~53.2;C46;L34~""Hormone Therapy...............:"";C3~54;C35~54.2;C46;L34~""Immunotherapy.................:"";C3~55;C35~55.2;C46;L34~"
 ^DIPT(1524,"F",41)="""Hema Trans/Endocrine Proc.....:"";C3~153.1;C35~153;C46;L34~S X=X;Z;""S X=X""~""Other Treatment...............:"";C3~57;C35~57.2;C46;L34~""* TEXT *"";S1~"
-^DIPT(1524,"F",42)="""Text-Remarks:"";C3;S1~113,.01;C3~""Text-DX Proc-PE:"";C3;S1~104,.01;C3~""Text-DX Proc-X-ray/Scan:"";C3;S1~105,.01;C3~""Text-DX Proc-Scopes:"";C3;S1~"
-^DIPT(1524,"F",43)="106,.01;C3~""Text-DX Proc-Lab Tests:"";C3;S1~116,.01;C3~""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""* FOLLOW-UP *"";S1~"
-^DIPT(1524,"F",44)="S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~""Distant Site 1................:"";C3~"
-^DIPT(1524,"F",45)="71.1;C35~""Distant Site 2................:"";C3~71.2;C35~""Distant Site 3................:"";C3~71.3;C35~""* SUBSEQUENT COURSE OF TREATMENT *"";S1~"
-^DIPT(1524,"F",46)="60,""Initiation Date...............:"";C3;S1~60,.01;C35~60,""Place.........................:"";C3~"
-^DIPT(1524,"F",47)="60,N DIERR X DXS(6,9.2) X ""F %=2:1:$L(X) I $E(X,%)?1U,$E(X,%-1)?1A S X=$E(X,0,%-1)_$C($A(X,%)+32)_$E(X,%+1,999)"" W X K DIP;C35;Z;""LOWERCASE(PLACE)""~"
-^DIPT(1524,"F",48)="60,""Surgery of Primary Site.......:"";C3~60,.041;C35~60,.04;C46;L34~60,""Radiation.....................:"";C3~60,.051;C35~60,.05;C46;L34~"
-^DIPT(1524,"F",49)="60,""Chemotherapy..................:"";C3~60,.061;C35~60,.06;C46;L34~60,""Hormone Therapy...............:"";C3~60,.071;C35~60,.07;C46;L34~"
-^DIPT(1524,"F",50)="60,""Immunotherapy.................:"";C3~60,.081;C35~60,.08;C46;L34~60,""Hema Trans/Endocrine Proc.....:"";C3~60,.021;C35~60,.02;C46;L34;X~"
-^DIPT(1524,"F",51)="60,S X=X;Z;""S X=X""~60,""Other Treatment...............:"";C3~60,.091;C35~60,.09;C46;L34~"
+^DIPT(1524,"F",42)="""Text-Remarks:"";C3;S1~113,.01;C3~""Text-DX Proc-PE:"";C3;S1~104,.01;C3~""Text-DX Proc-X-ray/Scan:"";C3;S1~105,.01;C3~""Text-DX Proc-Scopes:"";C3;S1~106,.01;C3~"
+^DIPT(1524,"F",43)="""Text-DX Proc-Lab Tests:"";C3;S1~116,.01;C3~""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""Text-Staging:"";C3;S1~285,.01;C3~"
+^DIPT(1524,"F",44)="""Text-Site Specific Data Items:"";C3;S1~286,.01;C3~""* FOLLOW-UP *"";S1~S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~"
+^DIPT(1524,"F",45)="""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~""Distant Site 1................:"";C3~71.1;C35~""Distant Site 2................:"";C3~71.2;C35~"
+^DIPT(1524,"F",46)="""Distant Site 3................:"";C3~71.3;C35~""* SUBSEQUENT COURSE OF TREATMENT *"";S1~60,""Initiation Date...............:"";C3;S1~60,.01;C35~"
+^DIPT(1524,"F",47)="60,""Place.........................:"";C3~"
+^DIPT(1524,"F",48)="60,N DIERR X DXS(6,9.2) X ""F %=2:1:$L(X) I $E(X,%)?1U,$E(X,%-1)?1A S X=$E(X,0,%-1)_$C($A(X,%)+32)_$E(X,%+1,999)"" W X K DIP;C35;Z;""LOWERCASE(PLACE)""~"
+^DIPT(1524,"F",49)="60,""Surgery of Primary Site.......:"";C3~60,.041;C35~60,.04;C46;L34~60,""Radiation.....................:"";C3~60,.051;C35~60,.05;C46;L34~"
+^DIPT(1524,"F",50)="60,""Chemotherapy..................:"";C3~60,.061;C35~60,.06;C46;L34~60,""Hormone Therapy...............:"";C3~60,.071;C35~60,.07;C46;L34~"
+^DIPT(1524,"F",51)="60,""Immunotherapy.................:"";C3~60,.081;C35~60,.08;C46;L34~60,""Hema Trans/Endocrine Proc.....:"";C3~60,.021;C35~60,.02;C46;L34;X~"
+^DIPT(1524,"F",52)="60,S X=X;Z;""S X=X""~60,""Other Treatment...............:"";C3~60,.091;C35~60,.09;C46;L34~"
 ^DIPT(1524,"H")="@"
 ^DIPT(1524,"SUB")=1
-^DIPT(1525,0)="ONCQA3^3111027.1041^^165.5^^^3111027^"
-^DIPT(1525,"DXS")=7
+^DIPT(1525,0)="ONCQA3^3181105.1118^^165.5^^^3181105"
 ^DIPT(1525,"DXS",1,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,7)):^(7),1:"""") S X=$P($G(^VA(200,+$P(DIP(1),U,3),0)),U)"
 ^DIPT(1525,"DXS",2,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.5,.03,"""",$P(DIP(1),U,3))"
 ^DIPT(1525,"DXS",3,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:"""") S X=$P($G(^ONCO(164,+$P(DIP(1),U,1),0)),U)"
 ^DIPT(1525,"DXS",4,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,2.2)):^(2.2),1:"""") S X=$P($G(^ONCO(169.3,+$P(DIP(1),U,3),0)),U)"
-^DIPT(1525,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
+^DIPT(1525,"DXS",5,9.2)="S I(0,0)=$G(D0),DIP(1)=$S($D(^ONCO(165.5,D0,2)):^(2),1:""""),D0=$P(DIP(1),U,5) S:'D0!'$D(^ONCO(164.43,+D0,0)) D0=-1 S D0=D0 S DIP(101)=$S($D(^ONCO(164.43,D0,0)):^(0),1:"""")"
 ^DIPT(1525,"DXS",6,9.2)="S DIP(1)=$S($D(^ONCO(165.5,D0,4,D1,0)):^(0),1:"""") S X=$$EXTERNAL^DIDU(165.51,2,"""",$P(DIP(1),U,3))"
 ^DIPT(1525,"F",1)="""CANCER REGISTRY QA ABSTRACT"";C3;S1~N %I,%H,% D NOW^%DTC S X=% S X=X,X=$P(X,""."",1) S Y=X D DT K DIP;C65;L12;d;Z;""DATE(NOW)""~"
 ^DIPT(1525,"F",2)="""Abstracted by.................:"";C3;S1~"
@@ -15689,10 +15687,10 @@ OSEHRA ZGO Export: PRINT TEMPLATE
 ^DIPT(1525,"F",41)="""Immunotherapy.................:"";C3~55;C35~55.2;C46;L34~""Hema Trans/Endocrine Proc.....:"";C3~153.1;C35~153;C46;L34~S X=X;Z;""S X=X""~"
 ^DIPT(1525,"F",42)="""Other Treatment...............:"";C3~57;C35~57.2;C46;L34~""* TEXT *"";S1~""Text-Remarks:"";C3;S1~113,.01;C3~""Text-DX Proc-PE:"";C3;S1~104,.01;C3~"
 ^DIPT(1525,"F",43)="""Text-DX Proc-X-ray/Scan:"";C3;S1~105,.01;C3~""Text-DX Proc-Scopes:"";C3;S1~106,.01;C3~""Text-DX Proc-Lab Tests:"";C3;S1~116,.01;C3~"
-^DIPT(1525,"F",44)="""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""* FOLLOW-UP *"";S1~S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~"
-^DIPT(1525,"F",45)="""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~""Distant Site 1................:"";C3~71.1;C35~""Distant Site 2................:"";C3~71.2;C35~"
-^DIPT(1525,"F",46)="""Distant Site 3................:"";C3~71.3;C35~""* SUBSEQUENT COURSE OF TREATMENT *"";S1~60,""Initiation Date...............:"";C3;S1~60,.01;C35~"
-^DIPT(1525,"F",47)="60,""Place.........................:"";C3~"
+^DIPT(1525,"F",44)="""Text-DX Proc-Op:"";C3;S1~103,.01;C3~""Text-DX Proc-Path:"";C3;S1~107,.01;C3~""Text-Staging:"";C3;S1~285,.01;C3~""Text-Site Specific Data Items:"";C3;S1~"
+^DIPT(1525,"F",45)="286,.01;C3~""* FOLLOW-UP *"";S1~S FUQA=""QA"";Z;""S FUQA=""QA""""~150~""* RECURRENCES *"";S1~""Type of First Recurrence......:"";C3;S1~70;C35~71;C46;L34~"
+^DIPT(1525,"F",46)="""Distant Site 1................:"";C3~71.1;C35~""Distant Site 2................:"";C3~71.2;C35~""Distant Site 3................:"";C3~71.3;C35~"
+^DIPT(1525,"F",47)="""* SUBSEQUENT COURSE OF TREATMENT *"";S1~60,""Initiation Date...............:"";C3;S1~60,.01;C35~60,""Place.........................:"";C3~"
 ^DIPT(1525,"F",48)="60,N DIERR X DXS(6,9.2) X ""F %=2:1:$L(X) I $E(X,%)?1U,$E(X,%-1)?1A S X=$E(X,0,%-1)_$C($A(X,%)+32)_$E(X,%+1,999)"" W X K DIP;C35;Z;""LOWERCASE(PLACE)""~"
 ^DIPT(1525,"F",49)="60,""Surgery of Primary Site.......:"";C3~60,.041;C35~60,.04;C46;L34~60,""Radiation.....................:"";C3~60,.051;C35~60,.05;C46;L34~"
 ^DIPT(1525,"F",50)="60,""Chemotherapy..................:"";C3~60,.061;C35~60,.06;C46;L34~60,""Hormone Therapy...............:"";C3~60,.071;C35~60,.07;C46;L34~"