diff --git a/p/C0CACTOR.m b/p/C0CACTOR.m
index 2a362b4..fe97083 100644
--- a/p/C0CACTOR.m
+++ b/p/C0CACTOR.m
@@ -180,13 +180,28 @@ NOK(INXML,AIEN,AOID,OUTXML) ; PROCESS A NEXT OF KIN TYPE ACTOR
      ;
 ORG(INXML,AIEN,AOID,OUTXML) ; PROCESS AN ORGANIZATION TYPE ACTOR
      ;
-     ; N AMAP
+     N AMAP,ZIEN,ZSITE
      S AMAP=$NA(^TMP($J,"AMAP"))
      K @AMAP
      S @AMAP@("ACTOROBJECTID")=AOID ;ACTOR OBJECT ID
-     S @AMAP@("ORGANIZATIONNAME")=$P($$SITE^VASITE,U,2)
+     S ZSITE=$$SITE^VASITE ; SITE FORMAT IEN^NAME^DATE
+     S ZIEN=$P(ZSITE,"^",1)
+     S @AMAP@("ORGANIZATIONNAME")=$P(ZSITE,U,2)
      S @AMAP@("ACTORSOURCEID")="ACTORSYSTEM_1"
+     S @AMAP@("ACTORADDRESSTYPE")="Office"
+     S @AMAP@("ACTORADDRESSLINE1")=$$GET1^DIQ(4,ZIEN_",",1.01)
+     S @AMAP@("ACTORADDRESSLINE2")=$$GET1^DIQ(4,ZIEN_",",1.02)
+     S @AMAP@("ACTORADDRESSCITY")=$$GET1^DIQ(4,ZIEN_",",1.03)
+     S @AMAP@("ACTORADDRESSSTATE")=$$GET1^DIQ(4,ZIEN_",",.02)
+     S @AMAP@("ACTORPOSTALCODE")=$$GET1^DIQ(4,ZIEN_",",1.04)
+     S @AMAP@("ACTORTELEPHONE")=""
+     S @AMAP@("ACTORTELEPHONETYPE")=""
+     S ZX=$$GET1^DIQ(4.03,"1,"_ZIEN_",",.03)
+     I ZX'="" D  ; THERE IS A PHONE NUMBER AVAILABLE
+     . S @AMAP@("ACTORTELEPHONE")=ZX
+     . S @AMAP@("ACTORTELEPHONETYPE")="Office"
      D MAP^C0CXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
+     K @AMAP
      Q
      ;
 PROVIDER(INXML,AIEN,AOID,OUTXML) ; PROCESS A PROVIDER TYPE ACTOR
@@ -220,6 +235,7 @@ PROVIDER(INXML,AIEN,AOID,OUTXML) ; PROCESS A PROVIDER TYPE ACTOR
      S @AMAP@("ACTOREMAIL")=$$EMAIL^C0CVA200(AIEN)
      S @AMAP@("ACTORADDRESSSOURCEID")="ACTORSYSTEM_1"
      S @AMAP@("ACTORSOURCEID")="ACTORSYSTEM_1" ; THE SYSTEM IS THE SOURCE
+     S @AMAP@("ACTORORGLINK")="ACTORORGANIZATION_1"
      D MAP^C0CXPATH(INXML,AMAP,OUTXML) ; MAP THE VARIABLE
      Q
      ;
diff --git a/p/C0CCCR.m b/p/C0CCCR.m
index 763d37f..bd42b2f 100644
--- a/p/C0CCCR.m
+++ b/p/C0CCCR.m
@@ -162,7 +162,8 @@ HDRMAP(CXML,DFN)	; MAP HEADER VARIABLES: FROM, TO ECT
  ; I IHDR="" D  ; HEADER ARRAY IS NOT PROVIDED, USE DEFAULTS
  D  ; ALWAYS MAP THESE VARIABLES
  . S @VMAP@("ACTORPATIENT")="ACTORPATIENT_"_DFN
- . S @VMAP@("ACTORFROM")="ACTORORGANIZATION_"_DUZ ; FROM DUZ - ???
+ . S @VMAP@("ACTORFROM")="ACTORPROVIDER_"_DUZ ; FROM DUZ - FROM PROVIDER
+ . ;S @VMAP@("ACTORFROM")="ACTORORGANIZATION_"_DUZ ; FROM DUZ - ???
  . S @VMAP@("ACTORFROM2")="ACTORSYSTEM_1" ; SECOND FROM IS THE SYSTEM
  . S @VMAP@("ACTORTO")="ACTORPATIENT_"_DFN ; FOR TEST PURPOSES
  . S @VMAP@("PURPOSEDESCRIPTION")="CEND PHR"  ; FOR TEST PURPOSES
diff --git a/p/C0CCCR0.m b/p/C0CCCR0.m
index 05493b3..54757e0 100644
--- a/p/C0CCCR0.m
+++ b/p/C0CCCR0.m
@@ -811,6 +811,10 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<ActorID>@@ACTORSOURCEID@@</ActorID>
  ;;</Actor>
  ;;</Source>
+ ;;<InternalCCRLink>
+ ;;<LinkID>@@ACTORORGLINK@@</LinkID>
+ ;;<LinkRelationship>representedOrganization</LinkRelationship>
+ ;;</InternalCCRLink>
  ;;</Actor>
  ;;</ACTOR-PROVIDER>
  ;;<ACTOR-ORG>
@@ -819,6 +823,21 @@ LOAD(ARY) ; LOAD A CCR TEMPLATE INTO ARY PASSED BY NAME
  ;;<Organization>
  ;;<Name>@@ORGANIZATIONNAME@@</Name>
  ;;</Organization>
+ ;;<Address>
+ ;;<Type>
+ ;;<Text>@@ACTORADDRESSTYPE@@</Text>
+ ;;</Type>
+ ;;<Line1>@@ACTORADDRESSLINE1@@</Line1>
+ ;;<City>@@ACTORADDRESSCITY@@</City>
+ ;;<State>@@ACTORADDRESSSTATE@@</State>
+ ;;<PostalCode>@@ACTORPOSTALCODE@@</PostalCode>
+ ;;</Address>
+ ;;<Telephone>
+ ;;<Value>@@ACTORTELEPHONE@@</Value>
+ ;;<Type>
+ ;;<Text>@@ACTORTELEPHONETYPE@@</Text>
+ ;;</Type>
+ ;;</Telephone>
  ;;<Source>
  ;;<Actor>
  ;;<ActorID>@@ACTORSOURCEID@@</ActorID>