diff --git a/GEOSCHEMchem_GridComp/GEOSCHEMchem_Registry.rc b/GEOSCHEMchem_GridComp/GEOSCHEMchem_Registry.rc
index a29b7d6c..8b367507 100644
--- a/GEOSCHEMchem_GridComp/GEOSCHEMchem_Registry.rc
+++ b/GEOSCHEMchem_GridComp/GEOSCHEMchem_Registry.rc
@@ -181,7 +181,7 @@
 #======================
 #  O3PPMV	                  | ppmv	   | xyz | C |    |   |   |	| ozone_volume_mixing_ratio_in_ppm
 #  OX_TEND	                  | kg kg-1 s-1    | xyz | C |    |   |   |	| tendency_of_odd_oxygen_mixing_ratio_due_to_chemistry
-  H2O_TEND                       | kg kg-1 s-1    | xyz | C |    |   |   |     | Tendency_of_water_vapor_mixing_ratio_due_to_chemistry
+#  H2O_TEND                       | kg kg-1 s-1    | xyz | C |    |   |   |     | Tendency_of_water_vapor_mixing_ratio_due_to_chemistry
 #===========	                  
 # GCHP only:	                  
 #===========	                  
@@ -250,12 +250,12 @@
  SO2AfterChem     |   vv-1     | xyz | C |    |   |   |     |      |    |    | S       | soluble_fraction_SO2
  KPPHvalue        |   1        | xyz | C |    |   |   |     |      |    |    | S       | HSAVE_for_KPP 
  SESQ_CARBDENS    | kgCm-3     | xyz | C |    |   |   |     |      |    |    | S       | sesquiterpene_conc_restart
- Iso_Hplus_coarse | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_H+_concentration_coarse
- Iso_Hplus_fine   | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_H+_concentration_fine
- Iso_sulfate      | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_sulfate_concentratio
- Iso_nitrate_coarse | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_Na+_concentration_coarse
- Iso_nitrate_fine | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_Na+_concentration_fine
- Iso_bisulfate    | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_bisulfate_concentration
+# Iso_Hplus_coarse | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_H+_concentration_coarse
+# Iso_Hplus_fine   | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_H+_concentration_fine
+# Iso_sulfate      | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_sulfate_concentratio
+# Iso_nitrate_coarse | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_Na+_concentration_coarse
+# Iso_nitrate_fine | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_Na+_concentration_fine
+# Iso_bisulfate    | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_bisulfate_concentration
 ### the following are not needed
 # Iso_acidpur      | molL-1     | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_acid
 # Iso_pH           |   1        | xyz | C |    |   |   |     |0.0   |    |    | S       | Isorropia_aerosol_pH
diff --git a/GEOS_ChemGridComp.F90 b/GEOS_ChemGridComp.F90
index 6fe262b9..7e6a8d9c 100644
--- a/GEOS_ChemGridComp.F90
+++ b/GEOS_ChemGridComp.F90
@@ -531,21 +531,21 @@ subroutine SetServices ( GC, RC )
 ! Ozone mole fraction needed by GOCART for
 ! CFC-12 photolysis.  For GMICHEM case, see below.
 ! ------------------------------------------------
-  IF(myState%enable_GOCART .AND. myState%enable_PCHEM) then
+  IF(myState%enable_GOCART .AND. myState%enable_PCHEM .AND. RATsProviderNumber(1)==PCHEM ) THEN
    CALL MAPL_AddConnectivity ( GC, &
         SRC_NAME  = (/"OX"/), &
         DST_NAME  = (/"O3"/), &
         DST_ID = GOCART, SRC_ID = PCHEM, __RC__  )
   ENDIF
 
-  IF(myState%enable_GOCART .AND. myState%enable_STRATCHEM) then
+  IF(myState%enable_GOCART .AND. myState%enable_STRATCHEM .AND. RATsProviderNumber(1)==STRATCHEM ) then
    CALL MAPL_AddConnectivity ( GC, &
         SRC_NAME  = (/"O3CHEM"/), &
         DST_NAME  = (/"O3"/), &
         DST_ID = GOCART, SRC_ID = STRATCHEM, __RC__  )
   ENDIF
 
-  IF(myState%enable_ACHEM .AND. myState%enable_PCHEM) then
+  IF(myState%enable_ACHEM .AND. myState%enable_PCHEM .AND. RATsProviderNumber(1)==ACHEM ) then
    CALL MAPL_AddConnectivity ( GC, &
         SRC_NAME  = (/"O3"/), &
         DST_NAME  = (/"O3"/), &
@@ -699,10 +699,12 @@ subroutine SetServices ( GC, RC )
 
 ! ... For GOCART::CFC
 ! -------------------
+  IF( RATsProviderNumber(1)==GMICHEM ) then
    CALL MAPL_AddConnectivity ( GC, &
     SRC_NAME  = (/"OX"/), &
     DST_NAME  = (/"O3"/), &
     DST_ID=GOCART, SRC_ID=GMICHEM, __RC__)
+  END IF
   
   END IF
 
@@ -748,14 +750,12 @@ subroutine SetServices ( GC, RC )
   END IF
 
   ! GOCART needs ozone for CFC12 photolysis.
-  ! Only provide it from GEOS-Chem if PCHEM is not running.
-  IF(myState%enable_GOCART .AND. myState%enable_GEOSCHEM) then
-   IF ( .NOT. myState%enable_PCHEM ) THEN
-    CALL MAPL_AddConnectivity ( GC, &
-       SRC_NAME  = (/"TRC_O3"/), &
-       DST_NAME  = (/"O3"/), &
-       DST_ID=GOCART, SRC_ID=GEOSCHEM, __RC__  )
-   ENDIF
+  ! Provide from GEOS-Chem if it is the OX provider 
+  IF(myState%enable_GOCART .AND. myState%enable_GEOSCHEM .AND. RATsProviderNumber(1)==GEOSCHEM ) then
+   CALL MAPL_AddConnectivity ( GC, &
+      SRC_NAME  = (/"OX"/), &
+      DST_NAME  = (/"O3"/), &
+      DST_ID=GOCART, SRC_ID=GEOSCHEM, __RC__  )
   ENDIF
 
 ! GEOS-Chem import of CO2