diff --git a/p/C0CVITAL.m b/p/C0CVITAL.m
index 6765ec9..2e55438 100644
--- a/p/C0CVITAL.m
+++ b/p/C0CVITAL.m
@@ -32,11 +32,15 @@ EXTRACT(VITXML,DFN,VITOUTXML)	; EXTRACT VITALS INTO PROVIDED XML TEMPLATE
  D DT^DILF(,C0CVLMT,.C0CEDT) ;
  D DT^DILF(,C0CVSTRT,.C0CSDT) ; 
  W "VITALS START: ",C0CVSTRT," LIMIT: ",C0CVLMT,!
- I $$SYSNAME^C0CSYS()="RPMS" D VITRPMS E  D VITVISTA
+ I $$RPMS^C0CUTIL() D VITRPMS QUIT
+ I ($$VISTA^C0CUTIL())!($$WV^C0CUTIL())!($$OV^C0CUTIL()) D VITVISTA QUIT
+ ;I $$SYSNAME^C0CSYS()="RPMS" D VITRPMS
+ ;E  D VITVISTA
  Q
  ;
 VITVISTA	; EXTRACT VITALS FROM VISTA INTO PROVIDED XML TEMPLATE
- D VITALS^ORQQVI(.VITRSLT,DFN,C0CSDT,C0CEDT)
+ ;D VITALS^ORQQVI(.VITRSLT,DFN,C0CSDT,C0CEDT)
+ D VITALS^ORQQVI(.VITRSLT,DFN,C0CVSTRT,C0CVLMT) ; GPL LET GMR HANDLE THE DATES
  I '$D(VITRSLT(1)) S @VITOUTXML@(0)=0 Q  ; RETURN NOT FOUND AND QUIT
  I $P(VITRSLT(1),U,2)="No vitals found." D  Q  ; NULL RESULT FROM RPC
  . I DEBUG W "NO VITALS FOUND FROM VITALS RPC",!