diff --git a/.circleci/config.yml b/.circleci/config.yml
index c3925282..9f25aed2 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -1,11 +1,11 @@
 version: 2.1
 
-# Anchors to prevent forgetting to update a version
-baselibs_version: &baselibs_version v7.7.0
-bcs_version: &bcs_version v11.00.0
+# Anchors in case we need to override the defaults from the orb
+#baselibs_version: &baselibs_version v7.17.0
+#bcs_version: &bcs_version v11.3.0
 
 orbs:
-  ci: geos-esm/circleci-tools@1
+  ci: geos-esm/circleci-tools@2
 
 workflows:
   build-and-test:
@@ -18,7 +18,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          baselibs_version: *baselibs_version
+          #baselibs_version: *baselibs_version
           repo: GOCART
           buildtarget: GOCART2G_GridComp
           mepodevelop: true
@@ -32,7 +32,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          baselibs_version: *baselibs_version
+          #baselibs_version: *baselibs_version
           repo: GOCART
           buildtarget: GOCART2G_GridComp
           mepodevelop: true
@@ -47,7 +47,7 @@ workflows:
           matrix:
             parameters:
               compiler: [gfortran, ifort]
-          baselibs_version: *baselibs_version
+          #baselibs_version: *baselibs_version
           repo: GEOSgcm
           checkout_fixture: true
           mepodevelop: true
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7030528c..411102c6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,14 +5,62 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased]
+### Removed
+
+- Removed all ExtData.rc files
+
+### Changed
+- Modified the file paths in carbon, sulfate, and nitrate ExtData.yaml files to used the revised version of the CEDS anthropogenic emissions. Note the previous version has an incorrect seasonal cycle.
+
+
+## [Unreleased] - 2024-05-14
+
+### Added
+
+- Required attributes for the 2D GOCART export fields in AERO_DP bundle have been set in subroutine append_to_bundle in Chem_AeroGeneric.F90. These export fields are imported by OBIO via Surface GC, and the missing of the attributes was causing the writing of surface import checkpoint to fail. The issue has been explained in detail on https://github.com/GEOS-ESM/GOCART/issues/258  
+
+
+## [Unreleased] - 2023-07-24
+
 
 ### Fixed
 
+
+- Add replay import patch for ozone.
+
+- corrected reading variable 'rhod' from files ( it was mispelled as 'rhop')
+
+- Silenced unwarranted error messages from wavelength/channel retrieval functions occurring when 470nm and/or 870nm channels are not included in GOCART resource file.
+
+- Add explicit `find_package()` calls for missing dependencies for MAPL for builds with spack-stack. Will eventually be fixed in MAPL in later versions
+- Corrected the units of the gravimetric soil moisture to percent instead of fractional in the FENGSHA dust scheme.
+- Fix issue of GOCART/GEOSgcm circular CMake dependencies when used as external project
+
 ### Added
 
+- Additional tuning parameters for the soil moisture and drylimit calculations for application specific tuning.
+
 ### Changed
--Changed Chem_SettlingSimple in the process library to call Mie Query for radius and rhop inputs to the settling velocity calculation. The calls to Chem_SettlingSimple were then changed accordingly in each of the species' grid comps. Since the RH flag is no longer needed, it was removed from GA_EnvironmentMod.F90 and each of the instance RC files.
+
+- Changed Chem_SettlingSimple in the process library to call Mie Query for radius and rhop inputs to the settling velocity calculation. The calls to Chem_SettlingSimple were then changed accordingly in each of the species' grid comps. Since the RH flag is no longer needed, it was removed from GA_EnvironmentMod.F90 and each of the instance RC files.
+
+
+- State Spec RC files for GOCART2G, CA, DU, NI, SU, and SS were updated such that the long names for AOD are more intuitive
+
+- Modified ExtData.yaml files to persist as climatological anthropogenic emissions after the end of the CEDS dataset in 2019. Analogous rc files removed as this capability is only available with ExtData2G
+
+- Update `components.yaml` to match that of GEOSgcm v11.6.1
+  - ESMA_env v4.29.0 (Baselibs 7.24.0, Updates for SLES15 at NCCS, various fixes)
+  - ESMA_cmake v3.48.0 (Fixes for NAS, debug flags, Updates for SLES15 at NCCS, MPI detection, ESMF and MPI CMake fixes for Spack)
+  - GMAO_Shared v1.9.8 (Bug fix for MITgcm, CI fixes, SLES15 Updates)
+  - MAPL 2.47.1 (Various fixes and features, support for Spack)
+- Update CI to use Baselibs by default from CircleCI Orb
+- Correct soil moisture parameterization in FENGSHA
+- Add `soil_moisture_factor` to the DU2G_instance_DU.rc (same name used in the K14 scheme) and DU2G_GridCompMod.F90 files for FENGSHA
+- Add `soil_drylimit_factor` to the DU2G_instance_DU.rc and DU2G_GridCompMod.F90 files for FENGSHA
+
+- Moved process library macros to header file.
+
 ## [v2.2.1] - 2023-05-30
 
 ### Fixed
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6b20e22c..b3cb6d8e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,24 +2,42 @@ cmake_minimum_required (VERSION 3.17)
 cmake_policy (SET CMP0053 NEW)
 cmake_policy (SET CMP0054 NEW)
 
-project (
-        GOCART
-        VERSION 2.1.1
-        LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
-
-if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
-    message(SEND_ERROR "In-source builds are disabled. Please
-           issue cmake command in separate build directory.")
-endif ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
-
-# Set the default build type to release
-if (NOT CMAKE_BUILD_TYPE)
-    message (STATUS "Setting build type to 'Release' as none was specified.")
-    set (CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
-    # Set the possible values of build type for cmake-gui
-    set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
-            "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
-endif ()
+# Let's look for the ESMA cmake directory in a few places
+# to see if we are building standalone
+set (ESMA_CMAKE_DIRS
+  cmake
+  @cmake
+  cmake@
+  )
+
+foreach (dir IN LISTS ESMA_CMAKE_DIRS)
+  if (EXISTS ${CMAKE_CURRENT_LIST_DIR}/${dir})
+    list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}")
+    set (ESMA_CMAKE_PATH "${CMAKE_CURRENT_LIST_DIR}/${dir}" CACHE PATH "Path to ESMA_cmake code")
+    set(GOCART_STANDALONE TRUE)
+  endif ()
+endforeach ()
+
+if (GOCART_STANDALONE)
+  project (
+          GOCART
+          VERSION 2.2.1
+          LANGUAGES Fortran CXX C)  # Note - CXX is required for ESMF
+
+  if ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
+      message(SEND_ERROR "In-source builds are disabled. Please
+            issue cmake command in separate build directory.")
+  endif ("${PROJECT_SOURCE_DIR}" STREQUAL "${PROJECT_BINARY_DIR}")
+
+  # Set the default build type to release
+  if (NOT CMAKE_BUILD_TYPE)
+      message (STATUS "Setting build type to 'Release' as none was specified.")
+      set (CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build." FORCE)
+      # Set the possible values of build type for cmake-gui
+      set_property (CACHE CMAKE_BUILD_TYPE PROPERTY STRINGS
+              "Debug" "Release" "MinSizeRel" "RelWithDebInfo")
+  endif ()
+endif()
 
 # Set build options
 option (UFS_GOCART "Build GOCART component for UFS" OFF)
@@ -41,11 +59,12 @@ if (UFS_GOCART)
 endif()
 
 if (NOT COMMAND esma)
-    list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake@")
     include (esma)
 endif()
 
-ecbuild_declare_project()
+if(GOCART_STANDALONE)
+  ecbuild_declare_project()
+endif()
 
 if (NOT Baselibs_FOUND)
   # Find dependencies
@@ -61,6 +80,12 @@ endif ()
 
 if (UFS_GOCART)
   find_package (GFTL_SHARED REQUIRED)
+  # Dom Heinzeller 2023/08/30 - workaround until https://github.com/GEOS-ESM/MAPL/pull/2320
+  # is merged and finds its way into the ufs-weather-model dependency tree
+  find_package (YAFYAML QUIET)
+  find_package (FARGPARSE QUIET)
+  find_package (PFLOGGER QUIET)
+  #
   find_package (MAPL REQUIRED)
   include(mapl_acg)
 elseif (IS_DIRECTORY "${PROJECT_SOURCE_DIR}/ESMF/Shared/MAPL@")
@@ -81,7 +106,9 @@ include_directories(${MPI_Fortran_INCLUDE_PATH})
 add_subdirectory (ESMF)
 add_subdirectory (Process_Library)
 
-ecbuild_install_project (NAME GOCART)
+if(GOCART_STANDALONE)
+  ecbuild_install_project (NAME GOCART)
+endif()
 
 # https://www.scivision.dev/cmake-auto-gitignore-build-dir/
 # --- auto-ignore build directory
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc
deleted file mode 100644
index 736a0008..00000000
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP.20C/CA2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,128 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-#========== Data Instance ==========================================================
-
-climBCphobic   'kg kg-1'   Y        N               0              0.0      1.0     BCPHOBIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climBCphilic   'kg kg-1'   Y        N               0              0.0      1.0     BCPHILIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climOCphobic   'kg kg-1'   Y        N               0              0.0      1.0     OCPHOBIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climOCphilic   'kg kg-1'   Y        N               0              0.0      1.0     OCPHILIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climBRphobic   'kg kg-1'   Y        N               0              0.0      1.0     BRPHOBIC   /dev/null
-climBRphilic   'kg kg-1'   Y        N               0              0.0      1.0     BRPHILIC   /dev/null
-
-climBCDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCDP001    /dev/null
-climBCWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCWT001    /dev/null
-climBCSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSD001    /dev/null
-climBCSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSV001    /dev/null
-
-climBCDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCDP002    /dev/null
-climBCWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCWT002    /dev/null
-climBCSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSD002    /dev/null
-climBCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSV002    /dev/null
-
-climOCDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCDP001    /dev/null
-climOCWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCWT001    /dev/null
-climOCSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSD001    /dev/null
-climOCSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSV001    /dev/null
-
-climOCDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCDP002    /dev/null
-climOCWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCWT002    /dev/null
-climOCSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSD002    /dev/null
-climOCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSV002    /dev/null
-
-climBRDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRDP001    /dev/null
-climBRWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRWT001    /dev/null
-climBRSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSD001    /dev/null
-climBRSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSV001    /dev/null
-
-climBRDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRDP002    /dev/null
-climBRWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRWT002    /dev/null
-climBRSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSD002    /dev/null
-climBRSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSV002    /dev/null
-
-
-#=========== Carbonaceous aerosol sources ===========================================
-# ORGANIC CARBON
-# ---------------
-# Biomass burning 
-OC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-OC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-OC_ANTEOC1 NA  N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-OC_ANTEOC2 NA  N Y %y4-%m2-%d2t12:00:00 none none oc_energy    ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# EDGAR based ship emissions
-OC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none oc_shipping  ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-OC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# Aviation emissions during the three phases of flight
-OC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-OC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-OC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-
-# SOA production
-pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-#============================================================================================================
-# BLACK CARBON
-# ------------
-# 
-BC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_bc.x576_y361_t14.%y4.nc4
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-BC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BC_ANTEBC1 NA  N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-BC_ANTEBC2 NA  N Y %y4-%m2-%d2t12:00:00 none none bc_energy    ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# EDGAR based ship emissions
-BC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none bc_shipping  ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-BC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# Aviation emissions during the LTO, SDC and CRS phases of flight
-BC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-BC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-BC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-
-#============================================================================================================
-# BROWN CARBON
-# ------------
-# Biomass burning
-BRC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_oc.x576_y361_t14.%y4.nc4
-
-# Terpene emission
-BRC_TERPENE NA  Y Y %y4-%m2-%d2t12:00:00 none none terpene /dev/null
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-BRC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BRC_ANTEBRC1 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc1 /dev/null
-BRC_ANTEBRC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null
-
-# EDGAR based ship emissions
-BRC_SHIP    NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null
-
-# Aircraft fuel consumption
-BRC_AIRCRAFT NA  Y Y %y4-%m2-%d2t12:00:00 none none none /dev/null
-
-# Aviation emissions during the three phases of flight
-BRC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-BRC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-BRC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-
-# SOA production
-pSOA_BIOB_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-%%
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc
deleted file mode 100644
index 43ed7284..00000000
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,128 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-#========== Data Instance ==========================================================
-
-climBCphobic   'kg kg-1'   Y        N               0              0.0      1.0     BCPHOBIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climBCphilic   'kg kg-1'   Y        N               0              0.0      1.0     BCPHILIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climOCphobic   'kg kg-1'   Y        N               0              0.0      1.0     OCPHOBIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climOCphilic   'kg kg-1'   Y        N               0              0.0      1.0     OCPHILIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climBRphobic   'kg kg-1'   Y        N               0              0.0      1.0     BRPHOBIC   /dev/null
-climBRphilic   'kg kg-1'   Y        N               0              0.0      1.0     BRPHILIC   /dev/null
-
-climBCDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCDP001    /dev/null
-climBCWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCWT001    /dev/null
-climBCSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSD001    /dev/null
-climBCSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSV001    /dev/null
-
-climBCDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCDP002    /dev/null
-climBCWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCWT002    /dev/null
-climBCSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSD002    /dev/null
-climBCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSV002    /dev/null
-
-climOCDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCDP001    /dev/null
-climOCWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCWT001    /dev/null
-climOCSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSD001    /dev/null
-climOCSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSV001    /dev/null
-
-climOCDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCDP002    /dev/null
-climOCWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCWT002    /dev/null
-climOCSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSD002    /dev/null
-climOCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSV002    /dev/null
-
-climBRDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRDP001    /dev/null
-climBRWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRWT001    /dev/null
-climBRSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSD001    /dev/null
-climBRSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSV001    /dev/null
-
-climBRDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRDP002    /dev/null
-climBRWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRWT002    /dev/null
-climBRSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSD002    /dev/null
-climBRSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSV002    /dev/null
-
-
-#=========== Carbonaceous aerosol sources ===========================================
-# ORGANIC CARBON
-# ---------------
-# Biomass burning -- QFED-v2.x
-OC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-OC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-OC_ANTEOC1 NA  N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-OC_ANTEOC2 NA  N Y %y4-%m2-%d2t12:00:00 none none oc_energy    ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# EDGAR based ship emissions
-OC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none oc_shipping  ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-OC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# Aviation emissions during the three phases of flight
-OC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-OC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-OC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-
-# SOA production
-pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-#============================================================================================================
-# BLACK CARBON
-# ------------
-# QFED v2.x
-BC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.061.%y4%m2%d2.nc4
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-BC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BC_ANTEBC1 NA  N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-BC_ANTEBC2 NA  N Y %y4-%m2-%d2t12:00:00 none none bc_energy    ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# EDGAR based ship emissions
-BC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none bc_shipping  ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-BC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# Aviation emissions during the LTO, SDC and CRS phases of flight
-BC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-BC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-BC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-
-#============================================================================================================
-# BROWN CARBON
-# ------------
-# Biomass burning -- QFED-v2.x
-BRC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_oc.061.%y4%m2%d2.nc4
-
-# Terpene emission
-BRC_TERPENE NA  Y Y %y4-%m2-%d2t12:00:00 none none terpene /dev/null
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-BRC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BRC_ANTEBRC1 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc1 /dev/null
-BRC_ANTEBRC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null
-
-# EDGAR based ship emissions
-BRC_SHIP    NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null
-
-# Aircraft fuel consumption
-BRC_AIRCRAFT NA  Y Y %y4-%m2-%d2t12:00:00 none none none /dev/null
-
-# Aviation emissions during the three phases of flight
-BRC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-BRC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-BRC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-
-# SOA production
-pSOA_BIOB_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-%%
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
index c25be12c..3a2b9589 100644
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
+++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/AMIP/CA2G_GridComp_ExtData.yaml
@@ -1,20 +1,28 @@
 Collections:
   CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
     template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
@@ -43,23 +51,23 @@ Samplings:
     update_frequency: PT24H
     update_offset: PT12H
     update_reference_time: '0'
+  CA2G_sample_3:
+    extrapolation: clim
+    update_frequency: PT24H
+    update_offset: PT12H
+    update_reference_time: '0'
+    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
 
 Exports:
   BC_AIRCRAFT:
-    collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_aviation
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_aviation}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_aviation}
   BC_ANTEBC1:
-    collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_nonenergy
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_nonenergy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_nonenergy}
   BC_ANTEBC2:
-    collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_energy
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_energy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_energy}
   BC_AVIATION_CDS:
     collection: /dev/null
     regrid: CONSERVE
@@ -84,10 +92,8 @@ Exports:
     - {starting: "1960-01-16T12:00", collection: CA2G_hfed.emis_bc.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
     - {starting: "2000-03-01T00:00", collection: CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
   BC_SHIP:
-    collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_shipping
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_shipping}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_shipping}
   BRC_AIRCRAFT:
     collection: /dev/null
     regrid: CONSERVE
@@ -137,20 +143,14 @@ Exports:
     sample: CA2G_sample_2
     variable: terpene
   OC_AIRCRAFT:
-    collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_aviation
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_aviation}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_aviation}
   OC_ANTEOC1:
-    collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_nonenergy
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_nonenergy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_nonenergy}
   OC_ANTEOC2:
-    collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_energy
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_energy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_energy}
   OC_AVIATION_CDS:
     collection: /dev/null
     regrid: CONSERVE
@@ -180,10 +180,8 @@ Exports:
     sample: CA2G_sample_1
     variable: biomass
   OC_SHIP:
-    collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_shipping
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_shipping}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_shipping}
   climBCDP001:
     collection: /dev/null
   climBCDP002:
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc
deleted file mode 100644
index cd44f28d..00000000
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,128 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-#========== Data Instance ==========================================================
-
-climBCphobic   'kg kg-1'   Y        N               0              0.0      1.0     BCPHOBIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climBCphilic   'kg kg-1'   Y        N               0              0.0      1.0     BCPHILIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climOCphobic   'kg kg-1'   Y        N               0              0.0      1.0     OCPHOBIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climOCphilic   'kg kg-1'   Y        N               0              0.0      1.0     OCPHILIC   ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climBRphobic   'kg kg-1'   Y        N               0              0.0      1.0     BRPHOBIC   /dev/null
-climBRphilic   'kg kg-1'   Y        N               0              0.0      1.0     BRPHILIC   /dev/null
-
-climBCDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCDP001    /dev/null
-climBCWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCWT001    /dev/null
-climBCSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSD001    /dev/null
-climBCSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSV001    /dev/null
-
-climBCDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCDP002    /dev/null
-climBCWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCWT002    /dev/null
-climBCSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSD002    /dev/null
-climBCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BCSV002    /dev/null
-
-climOCDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCDP001    /dev/null
-climOCWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCWT001    /dev/null
-climOCSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSD001    /dev/null
-climOCSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSV001    /dev/null
-
-climOCDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCDP002    /dev/null
-climOCWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCWT002    /dev/null
-climOCSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSD002    /dev/null
-climOCSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     OCSV002    /dev/null
-
-climBRDP001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRDP001    /dev/null
-climBRWT001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRWT001    /dev/null
-climBRSD001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSD001    /dev/null
-climBRSV001   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSV001    /dev/null
-
-climBRDP002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRDP002    /dev/null
-climBRWT002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRWT002    /dev/null
-climBRSD002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSD002    /dev/null
-climBRSV002   'kg m-2 s-1'  Y        N               0              0.0      1.0     BRSV002    /dev/null
-
-
-#=========== Carbonaceous aerosol sources ===========================================
-# ORGANIC CARBON
-# ---------------
-# Biomass burning -- QFED-v2.x
-OC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass /dev/null
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-OC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-OC_ANTEOC1 NA  N Y %y4-%m2-%d2t12:00:00 none none oc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-OC_ANTEOC2 NA  N Y %y4-%m2-%d2t12:00:00 none none oc_energy    ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# EDGAR based ship emissions
-OC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none oc_shipping  ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-OC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none oc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# Aviation emissions during the three phases of flight
-OC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-OC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-OC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-
-# SOA production
-pSOA_ANTHRO_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-#============================================================================================================
-# BLACK CARBON
-# ------------
-# QFED v2.x
-BC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-BC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BC_ANTEBC1 NA  N Y %y4-%m2-%d2t12:00:00 none none bc_nonenergy ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-BC_ANTEBC2 NA  N Y %y4-%m2-%d2t12:00:00 none none bc_energy    ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# EDGAR based ship emissions
-BC_SHIP    NA  N Y %y4-%m2-%d2t12:00:00 none none bc_shipping  ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-BC_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none bc_aviation ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# Aviation emissions during the LTO, SDC and CRS phases of flight
-BC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-BC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-BC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none bc_aviation /dev/null
-
-#============================================================================================================
-# BROWN CARBON
-# ------------
-# Biomass burning -- QFED-v2.x
-BRC_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_oc.006.%y4%m2%d2.nc4
-
-# Terpene emission
-BRC_TERPENE NA  Y Y %y4-%m2-%d2t12:00:00 none none terpene /dev/null
-
-# Biofuel Source -- Included in AeroCom anthropogenic emissions
-BRC_BIOFUEL NA  Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-BRC_ANTEBRC1 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc1 /dev/null
-BRC_ANTEBRC2 NA  Y Y %y4-%m2-%d2t12:00:00 none none anteoc2 /dev/null
-
-# EDGAR based ship emissions
-BRC_SHIP    NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_ship /dev/null
-
-# Aircraft fuel consumption
-BRC_AIRCRAFT NA  Y Y %y4-%m2-%d2t12:00:00 none none none /dev/null
-
-# Aviation emissions during the three phases of flight
-BRC_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-BRC_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-BRC_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none oc_aviation /dev/null
-
-# SOA production
-pSOA_BIOB_VOC NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-%%
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml
index 24c7a8e3..d04c1445 100644
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml
+++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_GridComp_ExtData.yaml
@@ -1,23 +1,32 @@
 Collections:
   CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
     template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
+  CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4:
+    template: ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
   CA2G_qfed2.emis_bc.006.%y4%m2%d2.nc4:
     template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_bc.006.%y4%m2%d2.nc4
     valid_range: "2014-12-01T12:00/2021-11-01T12:00"
@@ -43,23 +52,23 @@ Samplings:
     update_frequency: PT24H
     update_offset: PT12H
     update_reference_time: '0'
+  CA2G_sample_3:
+    extrapolation: clim
+    update_frequency: PT24H
+    update_offset: PT12H
+    update_reference_time: '0'
+    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
 
 Exports:
   BC_AIRCRAFT:
-    collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_aviation
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_aviation}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_aviation}
   BC_ANTEBC1:
-    collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_nonenergy
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_nonenergy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_nonenergy}
   BC_ANTEBC2:
-    collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_energy
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_energy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_energy}
   BC_AVIATION_CDS:
     collection: /dev/null
     regrid: CONSERVE
@@ -84,10 +93,8 @@ Exports:
     - {starting: "2014-12-01T12:00", collection: CA2G_qfed2.emis_bc.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
     - {starting: "2021-11-01T12:00", collection: CA2G_qfed2.emis_bc.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: CA2G_sample_1, variable: biomass}
   BC_SHIP:
-    collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: bc_shipping
+    - {starting: "1979-01-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: bc_shipping}
+    - {starting: "2019-12-15T12:00", collection: CA2G_BC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: bc_shipping}
   BRC_AIRCRAFT:
     collection: /dev/null
     regrid: CONSERVE
@@ -137,20 +144,14 @@ Exports:
     sample: CA2G_sample_2
     variable: terpene
   OC_AIRCRAFT:
-    collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_aviation
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_aviation}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_aviation}
   OC_ANTEOC1:
-    collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_nonenergy
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_nonenergy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_nonenergy}
   OC_ANTEOC2:
-    collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_energy
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_energy}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_energy}
   OC_AVIATION_CDS:
     collection: /dev/null
     regrid: CONSERVE
@@ -180,78 +181,88 @@ Exports:
     sample: CA2G_sample_1
     variable: biomass
   OC_SHIP:
-    collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: CA2G_sample_1
-    variable: oc_shipping
+    - {starting: "1979-01-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: CA2G_sample_1, regrid: CONSERVE, variable: oc_shipping}
+    - {starting: "2019-12-15T12:00", collection: CA2G_OC-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: CA2G_sample_3, variable: oc_shipping}
   climBCDP001:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: BCDP001
   climBCDP002:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: BCDP002
   climBCSD001:
     collection: /dev/null
+    sample: CA2G_sample_0
+    variable: BCSD001
   climBCSD002:
     collection: /dev/null
+    sample: CA2G_sample_0
+    variable: BCSD002
   climBCSV001:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: BCSV001
   climBCSV002:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: BCSV002
   climBCWT001:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: BCWT001
   climBCWT002:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: BCWT002
   climBCphilic:
     collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     sample: CA2G_sample_0
-    variable: BCPHILIC
+    variable: BCphilic
   climBCphobic:
     collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     sample: CA2G_sample_0
-    variable: BCPHOBIC
-  climBRDP001:
-    collection: /dev/null
-  climBRDP002:
-    collection: /dev/null
-  climBRSD001:
-    collection: /dev/null
-  climBRSD002:
-    collection: /dev/null
-  climBRSV001:
-    collection: /dev/null
-  climBRSV002:
-    collection: /dev/null
-  climBRWT001:
-    collection: /dev/null
-  climBRWT002:
-    collection: /dev/null
-  climBRphilic:
-    collection: /dev/null
-  climBRphobic:
-    collection: /dev/null
+    variable: BCphobic
   climOCDP001:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: OCDP001
   climOCDP002:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: OCDP002
   climOCSD001:
     collection: /dev/null
+    sample: CA2G_sample_0
+    variable: OCSD001
   climOCSD002:
     collection: /dev/null
+    sample: CA2G_sample_0
+    variable: OCSD002
   climOCSV001:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: OCSV001
   climOCSV002:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: OCSV002
   climOCWT001:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: OCWT001
   climOCWT002:
-    collection: /dev/null
+    collection: CA2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: CA2G_sample_0
+    variable: OCWT002
   climOCphilic:
     collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     sample: CA2G_sample_0
-    variable: OCPHILIC
+    variable: OCphilic
   climOCphobic:
     collection: CA2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     sample: CA2G_sample_0
-    variable: OCPHOBIC
+    variable: OCphobic
   pSOA_ANTHRO_VOC:
     collection: /dev/null
     regrid: CONSERVE
diff --git a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
index de20e655..f0fe0eb4 100644
--- a/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
+++ b/ESMF/GOCART2G_GridComp/CA2G_GridComp/CA2G_StateSpecs.rc
@@ -97,10 +97,10 @@ category: EXPORT
  *PSOA        | kg m-2 s-1   | xy    | N     |                                | * Aerosol SOA Production
  *SMASS       | kg m-3       | xy    | N     |                                | * Aerosol Surface Mass Concentration
  *CMASS       | kg m-2       | xy    | N     |                                | * Aerosol Column Mass Density
- *EXTTAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | * Aerosol Extinction AOT
- *STEXTTAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | * Aerosol Extinction AOT Stratosphere
- *SCATAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | * Aerosol Scattering AOT
- *STSCATAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | * Aerosol Scattering AOT Stratosphere
+ *EXTTAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | * Aerosol Optical Depth
+ *STEXTTAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | * Stratospheric Aerosol Optical Thickness
+ *SCATAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | * Aerosol Optical Depth Due to Scattering
+ *STSCATAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | * Stratospheric Aerosol Optical Thickness Due to Scattering
  *ANGSTR      | 1            | xy    | N     |                                | * Aerosol Angstrom parameter [470-870 nm]
  *FLUXU       | kg m-1 s-1   | xy    | N     |                                | * Aerosol column u-wind mass flux
  *FLUXV       | kg m-1 s-1   | xy    | N     |                                | * Aerosol column v-wind mass flux
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP.20C/DU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP.20C/DU2G_GridComp_ExtData.rc
deleted file mode 120000
index 7d86d9a2..00000000
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP.20C/DU2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1 +0,0 @@
-../DU2G_GridComp_ExtData.rc
\ No newline at end of file
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.rc
deleted file mode 120000
index 7d86d9a2..00000000
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/AMIP/DU2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1 +0,0 @@
-../DU2G_GridComp_ExtData.rc
\ No newline at end of file
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90 b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
index 246ea2a1..4e0788fd 100644
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
+++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridCompMod.F90
@@ -60,6 +60,7 @@ module DU2G_GridCompMod
        real                   :: alpha          ! FENGSHA scaling factor
        real                   :: gamma          ! FENGSHA tuning exponent
        real                   :: kvhmax         ! FENGSHA max. vertical/horizontal mass flux ratio [1]
+       real                   :: f_sdl          ! FENGSHA drylimit tuning factor
        real                   :: Ch_DU_res(NHRES) ! resolutions used for Ch_DU
        real                   :: Ch_DU          ! dust emission tuning coefficient [kg s2 m-5].
        logical                :: maringFlag=.false.  ! maring settling velocity correction
@@ -184,6 +185,8 @@ subroutine SetServices (GC, RC)
     case ('fengsha')
        call ESMF_ConfigGetAttribute (cfg, self%alpha,      label='alpha:', __RC__)
        call ESMF_ConfigGetAttribute (cfg, self%gamma,      label='gamma:', __RC__)
+       call ESMF_ConfigGetAttribute (cfg, self%f_swc,      label='soil_moisture_factor:', __RC__)
+       call ESMF_ConfigGetAttribute (cfg, self%f_sdl,      label='soil_drylimit_factor:', __RC__)
        call ESMF_ConfigGetAttribute (cfg, self%kvhmax,     label='vertical_to_horizontal_flux_ratio_limit:', __RC__)
     case ('k14')
        call ESMF_ConfigGetAttribute (cfg, self%clayFlag,   label='clayFlag:', __RC__)
@@ -795,10 +798,12 @@ subroutine Run1 (GC, import, export, clock, RC)
        if (associated(DU_EROD)) DU_EROD = f_erod_
 
     case ('fengsha')
+
        call DustEmissionFENGSHA (frlake, frsnow, lwi, slc, du_clay, du_sand, du_silt,       &
                                  du_ssm, du_rdrag, airdens(:,:,self%km), ustar, du_uthres,  &
                                  self%alpha, self%gamma, self%kvhmax, MAPL_GRAV,   &
-                                 self%rhop, self%sdist, emissions_surface, __RC__)
+                                 self%rhop, self%sdist, self%f_sdl, self%f_swc, emissions_surface,  __RC__)
+
     case ('ginoux')
 
        call DustEmissionGOCART2G(self%radius*1.e-6, frlake, wet1, lwi, u10m, v10m, &
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.rc
deleted file mode 100644
index 4293cbc3..00000000
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-DU_SRC        NA  N Y - none none du_src     ExtData/chemistry/DUST/v0.0.0/sfc/gocart.dust_source.v5a.x1152_y721.nc
-#DU_SRC       NA  N Y - 0.0  2.0  du_src     ExtData/chemistry/DUST/v0.0.0/sfc/australia.k14_dust_source.v5a.x1152_y721.nc
-DU_CLAY       NA  N Y - none none clay       ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_texture.x1152_y721_t1.nc4
-DU_SILT       NA  N Y - none none silt       ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_texture.x1152_y721_t1.nc4
-DU_SAND       NA  N Y - none none sand       ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_texture.x1152_y721_t1.nc4
-DU_TEXTURE    NA  N V - none none texture    ExtData/chemistry/DUST/v0.0.0/sfc/_gldas-fao.soil_category.x1152_y721_t1.nc4
-DU_VEG        NA  N V - none none domveg     ExtData/chemistry/DUST/v0.0.0/sfc/veg20.x1152_y721_t1.nc4
-DU_Z0         NA  N Y - none none roughness  ExtData/chemistry/DUST/v0.0.0/sfc/arlems-roughness.x1151_y720_t1.nc4
-
-DU_GVF        NA  N Y %y4-%m2-%d2t12:00:00 none none gvf  ExtData/chemistry/NDVI/v1.0.r3/sfc/qvi.006.%y4.nc4
-
-# DU data - 3D
-climdu001           'kg kg-1'            Y        N               0              0.0      1.0     DU001      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climdu002           'kg kg-1'            Y        N               0              0.0      1.0     DU002      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climdu003           'kg kg-1'            Y        N               0              0.0      1.0     DU003      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climdu004           'kg kg-1'            Y        N               0              0.0      1.0     DU004      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climdu005           'kg kg-1'            Y        N               0              0.0      1.0     DU005      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-
-# DU data - 2D
-climDUDP001         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUDP001    /dev/null
-climDUWT001         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUWT001    /dev/null
-climDUSD001         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSD001    /dev/null
-climDUSV001         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSV001    /dev/null
-
-climDUDP002         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUDP002    /dev/null
-climDUWT002         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUWT002    /dev/null
-climDUSD002         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSD002    /dev/null
-climDUSV002         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSV002    /dev/null
-
-climDUDP003         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUDP003    /dev/null
-climDUWT003         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUWT003    /dev/null
-climDUSD003         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSD003    /dev/null
-climDUSV003         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSV003    /dev/null
-
-climDUDP004         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUDP004    /dev/null
-climDUWT004         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUWT004    /dev/null
-climDUSD004         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSD004    /dev/null
-climDUSV004         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSV004    /dev/null
-
-climDUDP005         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUDP005    /dev/null
-climDUWT005         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUWT005    /dev/null
-climDUSD005         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSD005    /dev/null
-climDUSV005         'kg m-2 s-1'         Y        N               0              0.0      1.0     DUSV005    /dev/null
-
-%%
-
-
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
index a53bdd55..d5fc35fc 100644
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
+++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_StateSpecs.rc
@@ -71,19 +71,19 @@ category: EXPORT
 #........................................................................................
  DUSMASS       | kg m-3     | xy   | N    |                                | Dust Surface Mass Concentration
  DUCMASS       | kg m-2     | xy   | N    |                                | Dust Column Mass Density
- DUEXTTAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Extinction AOT
- DUSTEXTTAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Extinction AOT Stratosphere
- DUSCATAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Scattering AOT
- DUSTSCATAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Scattering AOT Stratosphere
- DUSMASS25     | kg m-3     | xy   | N    |                                | Dust Surface Mass Concentration - PM 2.5
- DUCMASS25     | kg m-2     | xy   | N    |                                | Dust Column Mass Density - PM 2.5
- DUEXTT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Extinction AOT - PM 2.5
- DUSCAT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Scattering AOT - PM 2.5
+ DUEXTTAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth
+ DUSTEXTTAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Stratospheric Aerosol Optical Thickness
+ DUSCATAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth Due to Scattering
+ DUSTSCATAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Stratospheric Aerosol Optical Thickness Due to Scattering
+ DUSMASS25     | kg m-3     | xy   | N    |                                | Dust Surface Mass Concentration of Particulate Matter < 2.5 microns (PM 2.5)
+ DUCMASS25     | kg m-2     | xy   | N    |                                | Dust Column Mass Density of Particulate Matter < 2.5 microns (PM 2.5)
+ DUEXTT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5)
+ DUSCAT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
  DUAERIDX      | 1          | xy   | N    |                                | Dust TOMS UV Aerosol Index
  DUFLUXU       | kg m-1 s-1 | xy   | N    |                                | Dust column u-wind mass flux
  DUFLUXV       | kg m-1 s-1 | xy   | N    |                                | Dust column v-wind mass flux
- DUEXTTFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Extinction AOT - PM 1.0 um
- DUSCATFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Scattering AOT - PM 1.0 um
+ DUEXTTFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0)
+ DUSCATFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Dust Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0)
  DUANGSTR      | 1          | xy   | N    |                                | Dust Angstrom parameter [470-870 nm]
  DUEM          | kg m-2 s-1 | xy   | N    | self%nbins                     | Dust Emission (Bin %d)
  DUSD          | kg m-2 s-1 | xy   | N    | self%nbins                     | Dust Sedimentation (Bin %d)
diff --git a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_instance_DU.rc b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_instance_DU.rc
index 3ab534f7..ae0a325d 100644
--- a/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_instance_DU.rc
+++ b/ESMF/GOCART2G_GridComp/DU2G_GridComp/DU2G_instance_DU.rc
@@ -61,3 +61,5 @@ pressure_lid_in_hPa: 0.01
 alpha: 0.3
 gamma: 1.3
 vertical_to_horizontal_flux_ratio_limit: 2.e-04
+soil_drylimit_factor: 1.0
+# soil_moisture_factor: 1.0
diff --git a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
index ba8ca591..7a7cbe90 100644
--- a/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
+++ b/ESMF/GOCART2G_GridComp/GOCART2G_StateSpecs.rc
@@ -21,14 +21,14 @@ category: EXPORT
 #----------------------------------------------------------------------------------------
  PSO4TOT        | kg m-2 s-1 | xyz  | C    |                                | Total Sulfate Produced in GOCART
 #........................................................................................
- TOTEXTTAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm]
- TOTSTEXTTAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] Stratosphere
- TOTSCATAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Scattering AOT [550 nm]
- TOTSTSCATAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Scattering AOT [550 nm] Stratosphere
- TOTEXTT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM2.5
- TOTSCAT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM2.5
- TOTEXTTFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM1.0
- TOTSCATFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Extinction AOT [550 nm] - PM1.0
+ TOTEXTTAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm
+ TOTSTEXTTAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Stratospheric Aerosol Optical Thickness at 550 nm
+ TOTSCATAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering
+ TOTSTSCATAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Stratospheric Aerosol Optical Thickness at 550 nm Due to Scattering
+ TOTEXTT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 2.5 microns  (PM2.5)
+ TOTSCAT25      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
+ TOTEXTTFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm from Particluate Matter < 1 micron  (PM1.0)
+ TOTSCATFM      | 1          | xy   | N    | size(self%wavelengths_vertint) | Total Aerosol Optical Depth at 550 nm Due to Scattering from Particulate Matter < 1 micron (PM1.0)
  TOTANGSTR      | 1          | xy   | N    |            | Total Aerosol Angstrom parameter [470-870 nm]
  TOTEXTCOEF     | m-1        | xyz  | C    | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient
  TOTEXTCOEFRH20 | m-1        | xyz  | C    | size(self%wavelengths_profile) | Total Aerosol Extinction coefficient - Fixed RH=20%
@@ -39,12 +39,12 @@ category: EXPORT
  TOTBCKCOEF     | m-1 sr-1   | xyz  | C    | size(self%wavelengths_profile) | Total Aerosol Single Scattering Backscatter coefficient
  TOTABCKTOA     | m-1 sr-1   | xyz  | C    |                                | Total Attenuated Backscatter Coefficient from TOA [532nm]
  TOTABCKSFC     | m-1 sr-1   | xyz  | C    |                                | Total Attenuated Backscatter Coefficient from surface [532nm]
- PM             | kg m-3     | xy   | N    |            | Total reconstructed PM
- PM_RH35        | kg m-3     | xy   | N    |            | Total reconstructed PM(RH=35%)
- PM_RH50        | kg m-3     | xy   | N    |            | Total reconstructed PM(RH=50%)
- PM25           | kg m-3     | xy   | N    |            | Total reconstructed PM2.5
- PM25_RH35      | kg m-3     | xy   | N    |            | Total reconstructed PM2.5(RH=35%)
- PM25_RH50      | kg m-3     | xy   | N    |            | Total reconstructed PM2.5(RH=50%)
+ PM             | kg m-3     | xy   | N    |            | Total Reconstructed Dry Particulate Matter
+ PM_RH35        | kg m-3     | xy   | N    |            | Total Reconstructed Particulate Matter at 35% Relative Humidity
+ PM_RH50        | kg m-3     | xy   | N    |            | Total Reconstructed Particulate Matter at 50% Relative Humidity
+ PM25           | kg m-3     | xy   | N    |            | Total Reconstructed Dry Particulate Matter < 2.5 microns (PM2.5)
+ PM25_RH35      | kg m-3     | xy   | N    |            | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 35% Relative Humidity
+ PM25_RH50      | kg m-3     | xy   | N    |            | Total Reconstructed Particulate Matter < 2.5 microns (PM2.5) at 50% Relative Humidity
 
 category: INTERNAL
 #----------------------------------------------------------------------------------------
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc
deleted file mode 100644
index d09decb3..00000000
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP.20C/NI2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|----------
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |   File
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template | Frequency
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|-----------
-
-# ======= Nitrate Data Instance ==========
-climNO3an1  'kg kg-1'  N    Y  F0   none      none     NO3AN1    /dev/null
-climNO3an2  'kg kg-1'  N    Y  F0   none      none     NO3AN2    /dev/null
-climNO3an3  'kg kg-1'  N    Y  F0   none      none     NO3AN3    /dev/null
-
-# ======= Nitrate Sources ========
-EMI_NH3_BB   'kg m-2 s-1'  N      Y      %y4-%m2-%d2T12:00:00    none     0.778     biomass     ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_nh3.x576_y361_t14.%y4.nc4 
-EMI_NH3_AG   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_EN   'kg m-2 s-1'  N      Y      %y4-%m2-%d2t12:00:00    none     none      nh3         ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-EMI_NH3_IN   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_RE   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_TR   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_OC   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      emiss_ocn   ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-
-NITRATE_HNO3 'mol mol-1'   N      N      %y4-%m2-%d2T12:00:00    none     0.20     hno3         ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-
-NI_regionMask NA           N      V      -                       none     none     REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-
-#DU            kg kg-1      N      N      -                       none     none     DU          /dev/null
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc
deleted file mode 100644
index 549bdca2..00000000
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|----------
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |   File
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template | Frequency
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|-----------
-
-# ======= Nitrate Data Instance ==========
-climNO3an1  'kg kg-1'  N    Y  F0   none      none     NO3AN1    /dev/null
-climNO3an2  'kg kg-1'  N    Y  F0   none      none     NO3AN2    /dev/null
-climNO3an3  'kg kg-1'  N    Y  F0   none      none     NO3AN3    /dev/null
-
-# ======= Nitrate Sources ========
-EMI_NH3_BB   'kg m-2 s-1'  N      Y      %y4-%m2-%d2T12:00:00    none     0.778     biomass     ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4
-EMI_NH3_AG   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_EN   'kg m-2 s-1'  N      Y      %y4-%m2-%d2t12:00:00    none     none      nh3         ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-EMI_NH3_IN   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_RE   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_TR   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_OC   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      emiss_ocn   ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-
-NITRATE_HNO3 'mol mol-1'   N      N      %y4-%m2-%d2T12:00:00    none     0.20     hno3         ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-
-NI_regionMask NA           N      V      -                       none     none     REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-
-#DU            kg kg-1      N      N      -                       none     none     DU          /dev/null
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
index e7596eed..7d14f853 100644
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
+++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/AMIP/NI2G_GridComp_ExtData.yaml
@@ -6,7 +6,8 @@ Collections:
   NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
     template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
   NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4:
     template: ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.061.%y4%m2%d2.nc4
     valid_range: "2000-02-29T12:00/2025-01-01"
@@ -28,6 +29,11 @@ Samplings:
     update_reference_time: '0'
   NI2G_sample_3:
     extrapolation: persist_closest
+  NI2G_sample_4:
+    update_frequency: PT24H
+    update_offset: PT12H
+    update_reference_time: '0'
+    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
 
 Exports:
   EMI_NH3_AG:
@@ -39,10 +45,8 @@ Exports:
     - {starting: "1960-01-16T12:00", collection: NI2G_hfed.emis_nh3.x576_y361.%y4%m2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
     - {starting: "2000-03-01T00:00", collection: NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
   EMI_NH3_EN:
-    collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_1
-    variable: nh3
+    - {starting: "1979-01-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, sample: NI2G_sample_1, regrid: CONSERVE, variable: nh3}
+    - {starting: "2019-12-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: NI2G_sample_4, variable: nh3}
   EMI_NH3_IN:
     collection: /dev/null
     regrid: CONSERVE
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc
deleted file mode 100644
index 2b571336..00000000
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,27 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|----------
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |   File
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template | Frequency
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|-----------
-
-# ======= Nitrate Data Instance ==========
-climNO3an1  'kg kg-1'  N    Y  F0   none      none     NO3AN1    /dev/null
-climNO3an2  'kg kg-1'  N    Y  F0   none      none     NO3AN2    /dev/null
-climNO3an3  'kg kg-1'  N    Y  F0   none      none     NO3AN3    /dev/null
-
-# ======= Nitrate Sources ========
-EMI_NH3_BB   'kg m-2 s-1'  N      Y      %y4-%m2-%d2T12:00:00    none     0.778     biomass     ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4
-EMI_NH3_AG   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_EN   'kg m-2 s-1'  N      Y      %y4-%m2-%d2t12:00:00    none     none      nh3         ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-EMI_NH3_IN   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_RE   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_TR   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      nh3_emis    /dev/null
-EMI_NH3_OC   'kg m-2 s-1'  Y      Y      %y4-%m2-%d2T12:00:00    none     none      emiss_ocn   ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
-
-NITRATE_HNO3 'mol mol-1'   N      N      %y4-%m2-%d2T12:00:00    none     0.20     hno3         ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-
-NI_regionMask NA           N      V      -                       none     none     REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-
-#DU            kg kg-1      N      N      -                       none     none     DU          /dev/null
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
index 9a05461a..80ec0318 100644
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
+++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_GridComp_ExtData.yaml
@@ -3,10 +3,13 @@ Collections:
     template: ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
   NI2G_GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4:
     template: ExtData/chemistry/GEIA/v0.0.0/sfc/GEIA.emis_NH3.ocean.x576_y361.t12.20080715_12z.nc4
+  NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4:
+    template: /discover/nobackup/projects/gmao/gmao_ops/pub/fp/das/Y%y4/M%m2/D%d2/GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
   NI2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
     template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
   NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   NI2G_qfed2.emis_nh3.006.%y4%m2%d2.nc4:
     template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_nh3.006.%y4%m2%d2.nc4
     valid_range: "2014-12-01T12:00/2021-11-01T12:00"
@@ -28,6 +31,11 @@ Samplings:
     update_reference_time: '0'
   NI2G_sample_3:
     extrapolation: persist_closest
+  NI2G_sample_4:
+    update_frequency: PT24H
+    update_offset: PT12H
+    update_reference_time: '0'
+    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
 
 Exports:
   EMI_NH3_AG:
@@ -39,10 +47,8 @@ Exports:
     - {starting: "2014-12-01T12:00", collection: NI2G_qfed2.emis_nh3.006.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
     - {starting: "2021-11-01T12:00", collection: NI2G_qfed2.emis_nh3.061.%y4%m2%d2.nc4, linear_transformation: [0.0, 0.778], regrid: CONSERVE, sample: NI2G_sample_1, variable: biomass}
   EMI_NH3_EN:
-    collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: NI2G_sample_1
-    variable: nh3
+    - {starting: "1979-01-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, sample: NI2G_sample_1, regrid: CONSERVE, variable: nh3}
+    - {starting: "2019-12-15T12:00", collection: NI2G_NH3-em-anthro_CMIP_CEDS_gn.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: NI2G_sample_4, variable: nh3}
   EMI_NH3_IN:
     collection: /dev/null
     regrid: CONSERVE
@@ -76,10 +82,18 @@ Exports:
     sample: NI2G_sample_3
     variable: REGION_MASK
   climNO3an1:
-    collection: /dev/null
+    collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
+    regrid: CONSERVE
+    sample: NI2G_sample_0
+    variable: NO3AN1
   climNO3an2:
-    collection: /dev/null
+    collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
+    regrid: CONSERVE
+    sample: NI2G_sample_0
+    variable: NO3AN2
   climNO3an3:
-    collection: /dev/null
-
+    collection: NI2G_GEOS.fp.asm.inst3_3d_aer_Nv.%y4%m2%d2_%h2%n2.V01.nc4
+    regrid: CONSERVE
+    sample: NI2G_sample_0
+    variable: NO3AN3
 
diff --git a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc
index cf42893a..b0cc0632 100644
--- a/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc
+++ b/ESMF/GOCART2G_GridComp/NI2G_GridComp/NI2G_StateSpecs.rc
@@ -49,12 +49,12 @@ category: EXPORT
   NH3MASS       | kg/kg        | xyz   | C     |                                | Ammonia Mass Mixing Ratio
   NH4MASS       | kg/kg        | xyz   | C     |                                | Ammonium Aerosol Mass Mixing Ratio
   NIMASS        | kg/kg        | xyz   | C     |                                | Nitrate Mass Mixing Ratio
-  NIMASS25      | kg/kg        | xyz   | C     |                                | Nitrate Mass Mixing Ratio [PM2.5]
+  NIMASS25      | kg/kg        | xyz   | C     |                                | Nitrate Mass Mixing Ratio of Particulate Matter < 2.5 microns (PM2.5)
   HNO3CONC      | kg m-3       | xyz   | C     |                                | Nitric Acid Mass Concentration
   NH3CONC       | kg m-3       | xyz   | C     |                                | Ammonia Mass Concentration
   NH4CONC       | kg m-3       | xyz   | C     |                                | Ammonium Mass Concentration
   NICONC        | kg m-3       | xyz   | C     |                                | Nitrate Mass Concentration
-  NICONC25      | kg m-3       | xyz   | C     |                                | Nitrate Mass Concentration [PM2.5]
+  NICONC25      | kg m-3       | xyz   | C     |                                | Nitrate Mass Concentration of Particulate Matter < 2.5 microns (PM2.5)
   NIEXTCOEF     | m-1          | xyz   | C     | size(self%wavelengths_profile) | Nitrate Extinction Coefficient
   NIEXTCOEFRH20 | m-1          | xyz   | C     | size(self%wavelengths_profile) | Nitrate Extinction Coefficient - fixed RH=20%
   NIEXTCOEFRH80 | m-1          | xyz   | C     | size(self%wavelengths_profile) | Nitrate Extinction Coefficient - fixed RH=80%
@@ -83,20 +83,20 @@ category: EXPORT
   NH3SMASS      | kg m-3       | xy    | N     |                                | Ammonia Surface Mass Concentration
   NH4SMASS      | kg m-3       | xy    | N     |                                | Ammonium Surface Mass Concentration
   NISMASS       | kg m-3       | xy    | N     |                                | Nitrate Surface Mass Concentration
-  NISMASS25     | kg m-3       | xy    | N     |                                | Nitrate Surface Mass Concentration [PM2.5]
+  NISMASS25     | kg m-3       | xy    | N     |                                | Nitrate Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5)
   HNO3CMASS     | kg m-3       | xy    | N     |                                | Nitric Acid Column Mass Density
   NH3CMASS      | kg m-3       | xy    | N     |                                | Ammonia Column Mass Density
   NH4CMASS      | kg m-3       | xy    | N     |                                | Ammonium Column Mass Density
   NICMASS       | kg m-2       | xy    | N     |                                | Nitrate Column Mass Density
-  NICMASS25     | kg m-2       | xy    | N     |                                | Nitrate Column Mass Density [PM2.5]
-  NIEXTTFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Extinction AOT - PM 1.0 um
-  NISCATFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Scattering AOT - PM 1.0 um
-  NIEXTT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Extinction AOT - PM 2.5 um
-  NISCAT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Scattering AOT - PM 2.5 um
-  NIEXTTAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Extinction AOT
-  NISTEXTTAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Extinction AOT Stratosphere
-  NISCATAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Scattering AOT
-  NISTSCATAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Scattering AOT Stratosphere
+  NICMASS25     | kg m-2       | xy    | N     |                                | Nitrate Column Mass Density of Particulate Matter < 2.5 microns (PM2.5)
+  NIEXTTFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0)
+  NISCATFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0)
+  NIEXTT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5)
+  NISCAT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
+  NIEXTTAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth
+  NISTEXTTAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Stratospheric Aerosol Optical Thickness
+  NISCATAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Aerosol Optical Depth Due to Scattering
+  NISTSCATAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Nitrate Stratospheric Aerosol Optical Thickness Due to Scattering
   NIANGSTR      | 1            | xy    | N     |                                | Nitrate Angstrom parameter [470-870 nm]
   NIFLUXU       | kg m-1 s-1   | xy    | N     |                                | Nitrate column u-wind mass flux
   NIFLUXV       | kg m-1 s-1   | xy    | N     |                                | Nitrate column v-wind mass flux
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP.20C/SS2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP.20C/SS2G_GridComp_ExtData.rc
deleted file mode 120000
index f4a705ce..00000000
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP.20C/SS2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1 +0,0 @@
-../SS2G_GridComp_ExtData.rc
\ No newline at end of file
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.rc
deleted file mode 120000
index f4a705ce..00000000
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/AMIP/SS2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1 +0,0 @@
-../SS2G_GridComp_ExtData.rc
\ No newline at end of file
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.rc
deleted file mode 100644
index f237f121..00000000
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,44 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-# SS.data - 3D
-climss001           'kg kg-1'            Y        N               0              0.0      1.0     SS001      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climss002           'kg kg-1'            Y        N               0              0.0      1.0     SS002      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climss003           'kg kg-1'            Y        N               0              0.0      1.0     SS003      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climss004           'kg kg-1'            Y        N               0              0.0      1.0     SS004      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-climss005           'kg kg-1'            Y        N               0              0.0      1.0     SS005      ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-
-
-# SS.data - 2D
-
-
-climSSDP001         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSDP001    /dev/null
-climSSWT001         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSWT001    /dev/null
-climSSSD001         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSD001    /dev/null
-climSSSV001         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSV001    /dev/null
-
-climSSDP002         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSDP002    /dev/null
-climSSWT002         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSWT002    /dev/null
-climSSSD002         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSD002    /dev/null
-climSSSV002         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSV002    /dev/null
-
-climSSDP003         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSDP003    /dev/null
-climSSWT003         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSWT003    /dev/null
-climSSSD003         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSD003    /dev/null
-climSSSV003         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSV003    /dev/null
-
-climSSDP004         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSDP004    /dev/null
-climSSWT004         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSWT004    /dev/null
-climSSSD004         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSD004    /dev/null
-climSSSV004         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSV004    /dev/null
-
-climSSDP005         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSDP005    /dev/null
-climSSWT005         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSWT005    /dev/null
-climSSSD005         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSD005    /dev/null
-climSSSV005         'kg m-2 s-1'         Y        N               0              0.0      1.0     SSSV005    /dev/null
-
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc
index 4feb4050..6adfe688 100644
--- a/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc
+++ b/ESMF/GOCART2G_GridComp/SS2G_GridComp/SS2G_StateSpecs.rc
@@ -42,7 +42,7 @@ category: EXPORT
  NAME          | UNITS        | DIMS  | VLOC  | UNGRIDDED                      | LONG NAME
 #----------------------------------------------------------------------------------------
  SSMASS        | kg kg-1      | xyz   | C     |                                | Sea Salt Mass Mixing Ratio
- SSMASS25      | kg kg-1      | xyz   | C     |                                | Sea Salt Mass Mixing Ratio - PM 2.5
+ SSMASS25      | kg kg-1      | xyz   | C     |                                | Sea Salt Mass Mixing Ratio of Particulate Matter < 2.5 microns (PM2.5)
  SSCONC        | kg m-3       | xyz   | C     |                                | Sea Salt Mass Concentration
  SSEXTCOEF     | m-1          | xyz   | C     | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient
  SSEXTCOEFRH20 | m-1          | xyz   | C     | size(self%wavelengths_profile) | Sea Salt Extinction Coefficient - Fixed RH=20%
@@ -59,17 +59,17 @@ category: EXPORT
  SSSV          | kg m-2 s-1   | xy    | N     | self%nbins                     | Sea Salt Convective Scavenging (Bin %d)
  SSSMASS       | kg m-3       | xy    | N     |                                | Sea Salt Surface Mass Concentration
  SSCMASS       | kg m-2       | xy    | N     |                                | Sea Salt Column Mass Density
- SSEXTTAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Extinction AOT
- SSSTEXTTAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Extinction AOT Stratosphere
- SSSCATAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Scattering AOT
- SSSTSCATAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Scattering AOT Stratosphere
- SSSMASS25     | kg m-3       | xy    | N     |                                | Sea Salt Surface Mass Concentration - PM 2.5
- SSCMASS25     | kg m-2       | xy    | N     |                                | Sea Salt Column Mass Density - PM 2.5
- SSEXTT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Extinction AOT - PM 2.5
- SSSCAT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Scattering AOT - PM 2.5
+ SSEXTTAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth
+ SSSTEXTTAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness
+ SSSCATAU      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering
+ SSSTSCATAU    | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Stratospheric Aerosol Optical Thickness Due to Scattering
+ SSSMASS25     | kg m-3       | xy    | N     |                                | Sea Salt Surface Mass Concentration of Particulate Matter < 2.5 microns (PM2.5)
+ SSCMASS25     | kg m-2       | xy    | N     |                                | Sea Salt Column Mass Density of Particulate Matter < 2.5 microns (PM2.5)
+ SSEXTT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 2.5 microns (PM2.5)
+ SSSCAT25      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 2.5 microns (PM2.5)
  SSAERIDX      | 1            | xy    | N     |                                | Sea Salt TOMS UV Aerosol Index
- SSEXTTFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Extinction AOT [550 nm] - PM 1.0 um
- SSSCATFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Scattering AOT [550 nm] - PM 1.0 um
+ SSEXTTFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth from Particulate Matter < 1 micron (PM1.0)
+ SSSCATFM      | 1            | xy    | N     | size(self%wavelengths_vertint) | Sea Salt Aerosol Optical Depth Due to Scattering from Particulate Matter < 1 micron (PM1.0)
  SSANGSTR      | 1            | xy    | N     |                                | Sea Salt Angstrom parameter [470-870 nm]
  SSFLUXU       | kg m-1 s-1   | xy    | N     |                                | Sea Salt column u-wind mass flux
  SSFLUXV       | kg m-1 s-1   | xy    | N     |                                | Sea Salt column v-wind mass flux
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc
deleted file mode 100644
index ea89f3a1..00000000
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP.20C/SU2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-#===== Sulfate Data Instance ==========================================
-climSO4         'kg kg-1'     Y   N               0              0.0      1.0     SO4        ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-#climDMS         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-#climMSA         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-#climSO2         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-
-climSUDP001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP001    /dev/null
-climSUWT001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT001    /dev/null
-climSUSD001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD001    /dev/null
-climSUSV001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV001    /dev/null
-
-climSUDP002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP002    /dev/null
-climSUWT002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT002    /dev/null
-climSUSD002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD002    /dev/null
-climSUSV002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV002    /dev/null
-
-climSUDP003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP003    /dev/null
-climSUWT003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT003    /dev/null
-climSUSD003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD003    /dev/null
-climSUSV003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV003    /dev/null
-
-climSUDP004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP004    /dev/null
-climSUWT004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT004    /dev/null
-climSUSD004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD004    /dev/null
-climSUSV004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV004    /dev/null
-
-
-#====== Sulfate Sources =================================================
-# Biomass burning 
-SU_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_so2.x576_y361_t14.%y4.nc4
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-SU_ANTHROL1 NA  N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy  ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-SU_ANTHROL2 NA  N Y %y4-%m2-%d2t12:00:00 none none so2_energy     ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# Ship emissions
-SU_SHIPSO2    NA  N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-SU_SHIPSO4    NA  N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-SU_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none so2_aviation   ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# DMS concentration
-SU_DMSO NA  Y Y %y4-%m2-%d2t12:00:00 none none conc ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-
-# Aviation emissions during the three phases of flight
-SU_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-SU_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-SU_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-
-# H2O2, OH and NO3 mixing ratios
-SU_H2O2 NA  N Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-SU_OH   NA  N Y %y4-%m2-%d2t12:00:00 none none oh   ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-SU_NO3  NA  N Y %y4-%m2-%d2t12:00:00 none none no3  ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-
-# Production of SO2 from OCS oxidation
-pSO2_OCS NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-#SU_regionMask   NA  N v - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc
deleted file mode 100644
index 7f5a9e02..00000000
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-#===== Sulfate Data Instance ==========================================
-climSO4         'kg kg-1'     Y   N               0              0.0      1.0     SO4        ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-#climDMS         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-#climMSA         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-#climSO2         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-
-climSUDP001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP001    /dev/null
-climSUWT001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT001    /dev/null
-climSUSD001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD001    /dev/null
-climSUSV001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV001    /dev/null
-
-climSUDP002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP002    /dev/null
-climSUWT002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT002    /dev/null
-climSUSD002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD002    /dev/null
-climSUSV002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV002    /dev/null
-
-climSUDP003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP003    /dev/null
-climSUWT003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT003    /dev/null
-climSUSD003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD003    /dev/null
-climSUSV003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV003    /dev/null
-
-climSUDP004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP004    /dev/null
-climSUWT004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT004    /dev/null
-climSUSD004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD004    /dev/null
-climSUSV004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV004    /dev/null
-
-
-#====== Sulfate Sources =================================================
-# Biomass burning -- QFED-v2.x
-SU_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.061.%y4%m2%d2.nc4
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-SU_ANTHROL1 NA  N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy  ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-SU_ANTHROL2 NA  N Y %y4-%m2-%d2t12:00:00 none none so2_energy     ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# Ship emissions
-SU_SHIPSO2    NA  N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-SU_SHIPSO4    NA  N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-SU_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none so2_aviation   ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# DMS concentration
-SU_DMSO NA  Y Y %y4-%m2-%d2t12:00:00 none none conc ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-
-# Aviation emissions during the three phases of flight
-SU_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-SU_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-SU_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-
-# H2O2, OH and NO3 mixing ratios
-SU_H2O2 NA  N Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-SU_OH   NA  N Y %y4-%m2-%d2t12:00:00 none none oh   ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-SU_NO3  NA  N Y %y4-%m2-%d2t12:00:00 none none no3  ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-
-# Production of SO2 from OCS oxidation
-pSO2_OCS NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-#SU_regionMask   NA  N v - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
index bdeb7e32..2a71f075 100644
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
+++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/AMIP/SU2G_GridComp_ExtData.yaml
@@ -4,15 +4,20 @@ Collections:
   SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
     template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
   SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
     template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
@@ -35,23 +40,23 @@ Samplings:
     update_frequency: PT24H
     update_offset: PT12H
     update_reference_time: '0'
+  SU2G_sample_3:
+    extrapolation: clim
+    update_frequency: PT24H
+    update_offset: PT12H
+    update_reference_time: '0'
+    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
 
 Exports:
   SU_AIRCRAFT:
-    collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_aviation
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_aviation}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_aviation}
   SU_ANTHROL1:
-    collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_nonenergy
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_nonenergy}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_nonenergy}
   SU_ANTHROL2:
-    collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_energy
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_energy}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_energy}
   SU_AVIATION_CDS:
     collection: /dev/null
     regrid: CONSERVE
@@ -91,15 +96,11 @@ Exports:
     sample: SU2G_sample_1
     variable: oh
   SU_SHIPSO2:
-    collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_shipping
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_shipping}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_shipping}
   SU_SHIPSO4:
-    collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so4_shipping
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so4_shipping}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so4_shipping}
   climSO4:
     collection: SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     sample: SU2G_sample_0
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc
deleted file mode 100644
index d5ef60c0..00000000
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.rc
+++ /dev/null
@@ -1,67 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-
-#===== Sulfate Data Instance ==========================================
-climSO4         'kg kg-1'     Y   N               0              0.0      1.0     SO4        ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-#climDMS         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-#climMSA         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-#climSO2         'kg kg-1'     Y   N               -              0.0      1.0     none       /dev/null
-
-climSUDP001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP001    /dev/null
-climSUWT001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT001    /dev/null
-climSUSD001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD001    /dev/null
-climSUSV001    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV001    /dev/null
-
-climSUDP002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP002    /dev/null
-climSUWT002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT002    /dev/null
-climSUSD002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD002    /dev/null
-climSUSV002    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV002    /dev/null
-
-climSUDP003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP003    /dev/null
-climSUWT003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT003    /dev/null
-climSUSD003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD003    /dev/null
-climSUSV003    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV003    /dev/null
-
-climSUDP004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUDP004    /dev/null
-climSUWT004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUWT004    /dev/null
-climSUSD004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSD004    /dev/null
-climSUSV004    'kg m-2 s-1'   Y   N               0              0.0      1.0     SUSV004    /dev/null
-
-
-#====== Sulfate Sources =================================================
-# Biomass burning -- QFED-v2.x
-SU_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 0.778 biomass ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4
-
-# Anthropogenic (BF & FF) emissions -- allowed to input as two layers
-SU_ANTHROL1 NA  N Y %y4-%m2-%d2t12:00:00 none none so2_nonenergy  ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-SU_ANTHROL2 NA  N Y %y4-%m2-%d2t12:00:00 none none so2_energy     ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-
-# Ship emissions
-SU_SHIPSO2    NA  N Y %y4-%m2-%d2t12:00:00 none none so2_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-SU_SHIPSO4    NA  N Y %y4-%m2-%d2t12:00:00 none none so4_shipping ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-
-# Aircraft fuel consumption
-SU_AIRCRAFT NA  N Y %y4-%m2-%d2t12:00:00 none none so2_aviation   ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-
-# DMS concentration
-SU_DMSO NA  Y Y %y4-%m2-%d2t12:00:00 none none conc ExtData/chemistry/Lana/v2011/DMSclim_sfcconcentration.x360_y181_t12.Lana2011.nc4
-
-# Aviation emissions during the three phases of flight
-SU_AVIATION_LTO NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-SU_AVIATION_CDS NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-SU_AVIATION_CRS NA  Y Y %y4-%m2-%d2t12:00:00 none none so2_aviation /dev/null
-
-# H2O2, OH and NO3 mixing ratios
-SU_H2O2 NA  N Y %y4-%m2-%d2t12:00:00 none none h2o2 ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-SU_OH   NA  N Y %y4-%m2-%d2t12:00:00 none none oh   ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-SU_NO3  NA  N Y %y4-%m2-%d2t12:00:00 none none no3  ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
-
-# Production of SO2 from OCS oxidation
-pSO2_OCS NA Y Y %y4-%m2-%d2t12:00:00 none none biofuel /dev/null
-
-#SU_regionMask   NA  N v - none none REGION_MASK ExtData/chemistry/Masks/v0.0.0/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-%%
-
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml
index dbb6c462..3e09c314 100644
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml
+++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_GridComp_ExtData.yaml
@@ -4,18 +4,24 @@ Collections:
   SU2G_MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4:
     template: ExtData/chemistry/MERRA2GMI/v0.0.0/L72/MERRA2_GMI.tavg24_3d_dac_Nv.x576_y361_t12.%y4.nc4
   SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/L72/SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4:
-    template: ExtData/chemistry/CEDS/v2021-04-21/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    template: ExtData/chemistry/CEDS/v2021-04-21-revised/sfc/SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
+    valid_range: "1979-01-15T12:00/2019-12-15T12:00"
   SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4:
     template: ExtData/chemistry/MERRA2/v0.0.0/L72/merra2.aer_Nv.2003-2015.2008%m2clm.nc4
-    valid_range: "2008-01-01T12:00:00/2008-12-15T12:00:00"
+  SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4:
+    template: ExtData/chemistry/MERRA2/v0.0.0/sfc/merra2.aer_Nx.2003-2015.2008%m2clm.nc4
   SU2G_qfed2.emis_so2.006.%y4%m2%d2.nc4:
     template: ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_so2.006.%y4%m2%d2.nc4
     valid_range: "2014-12-01T12:00/2021-11-01T12:00"
@@ -35,23 +41,23 @@ Samplings:
     update_frequency: PT24H
     update_offset: PT12H
     update_reference_time: '0'
+  SU2G_sample_3:
+    extrapolation: clim
+    update_frequency: PT24H
+    update_offset: PT12H
+    update_reference_time: '0'
+    source_time: "2019-01-15T12:00/2019-12-15T00:00:00"
 
 Exports:
   SU_AIRCRAFT:
-    collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_aviation
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_aviation}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-AIR-anthro_input4MIPs_emissions_CMIP_CEDS-2021-04-21_gn__aviation.x576_y361_z72_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_aviation}
   SU_ANTHROL1:
-    collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_nonenergy
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_nonenergy}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_nonenergy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_nonenergy}
   SU_ANTHROL2:
-    collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_energy
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_energy}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_energy.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_energy}
   SU_AVIATION_CDS:
     collection: /dev/null
     regrid: CONSERVE
@@ -91,51 +97,79 @@ Exports:
     sample: SU2G_sample_1
     variable: oh
   SU_SHIPSO2:
-    collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so2_shipping
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so2_shipping}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO2-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so2_shipping}
   SU_SHIPSO4:
-    collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4
-    regrid: CONSERVE
-    sample: SU2G_sample_1
-    variable: so4_shipping
+    - {starting: "1979-01-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, sample: SU2G_sample_1, regrid: CONSERVE, variable: so4_shipping}
+    - {starting: "2019-12-15T12:00", collection: SU2G_SO4-em-anthro_CMIP_CEDS_gn_shipping.x2304_y1441_t12.%y4.nc4, regrid: CONSERVE, sample: SU2G_sample_3, variable: so4_shipping}
   climSO4:
     collection: SU2G_merra2.aer_Nv.2003-2015.2008%m2clm.nc4
     sample: SU2G_sample_0
     variable: SO4
   climSUDP001:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUDP001
   climSUDP002:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUDP002
   climSUDP003:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUDP003
   climSUDP004:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUDP004
   climSUSD001:
     collection: /dev/null
+    sample: SU2G_sample_0
+    variable: SUSD001
   climSUSD002:
     collection: /dev/null
+    sample: SU2G_sample_0
+    variable: SUSD002
   climSUSD003:
     collection: /dev/null
+    sample: SU2G_sample_0
+    variable: SUSD003
   climSUSD004:
     collection: /dev/null
+    sample: SU2G_sample_0
+    variable: SUSD004
   climSUSV001:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUSV001
   climSUSV002:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUSV002
   climSUSV003:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUSV003
   climSUSV004:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUSV004
   climSUWT001:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUWT001
   climSUWT002:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUWT002
   climSUWT003:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUWT003
   climSUWT004:
-    collection: /dev/null
+    collection: SU2G_merra2.aer_Nx.2003-2015.2008%m2clm.nc4
+    sample: SU2G_sample_0
+    variable: SUWT004
   pSO2_OCS:
     collection: /dev/null
     regrid: CONSERVE
diff --git a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc
index b8f051b4..ddcdf0b2 100644
--- a/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc
+++ b/ESMF/GOCART2G_GridComp/SU2G_GridComp/SU2G_StateSpecs.rc
@@ -53,10 +53,10 @@ category: EXPORT
 #----------------------------------------------------------------------------------------
  NAME          | UNITS      | DIMS | VLOC | UNGRIDDED                      | LONG NAME
 #----------------------------------------------------------------------------------------
- SUEM          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfer Emission (Bin %d)
- SUDP          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfate Dry Deposition (Bin %d)
- SUSD          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfate Settling (Bin %d)
- SUWT          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfate Wet Deposition (Bin %d)
+ SUEM          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfur Emission (Bin %d)
+ SUDP          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfur Dry Deposition (Bin %d)
+ SUSD          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfur Settling (Bin %d)
+ SUWT          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfur Wet Deposition (Bin %d)
  SUSV          | kg m-2 s-1 | xy   | N    | self%nbins                     | Sulfate Convective Scavenging (Bin %d)
  SO4EMAN       | kg m-2 s-1 | xy   | N    |                                | SO4 Anthropogenic Emissions
  SO2EMAN       | kg m-2 s-1 | xy   | N    |                                | SO2 Anthropogenic Emissions
@@ -95,10 +95,10 @@ category: EXPORT
  SUFLUXU       | kg m-1 s-1 | xy   | N    |                                | SO4 column u-wind mass flux
  SUFLUXV       | kg m-1 s-1 | xy   | N    |                                | SO4 column v-wind mass flux
  SO4MASS       | kg kg-1    | xyz  | C    |                                | SO4 Aerosol Mass Mixing Ratio
- SUEXTTAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Extinction AOT
- SUSTEXTTAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Extinction AOT Stratosphere
- SUSCATAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Scattering AOT
- SUSTSCATAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Scattering AOT Stratosphere
+ SUEXTTAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth
+ SUSTEXTTAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness
+ SUSCATAU      | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Aerosol Optical Depth Due to Scattering
+ SUSTSCATAU    | 1          | xy   | N    | size(self%wavelengths_vertint) | SO4 Stratospheric Aerosol Optical Thickness Due to Scattering
  SO4SAREA      | m2 m-3     | xyz  | C    |                                | SO4 Surface Area Density
  SO4SNUM       | m-3        | xyz  | C    |                                | SO4 Number Density
 
diff --git a/ESMF/GOCART_GridComp/CFC_GridComp/AMIP.20C/CFC_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CFC_GridComp/AMIP.20C/CFC_GridComp_ExtData.rc
deleted file mode 100644
index 7035706f..00000000
--- a/ESMF/GOCART_GridComp/CFC_GridComp/AMIP.20C/CFC_GridComp_ExtData.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CFC12 NA  N Y - none none CFC-12_EMISSION ExtData/g5chem/sfc/ARCTAS.CFC12.emission.x540_y361.2008.hdf
-%%
-
diff --git a/ESMF/GOCART_GridComp/CFC_GridComp/AMIP/CFC_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CFC_GridComp/AMIP/CFC_GridComp_ExtData.rc
deleted file mode 100644
index 7035706f..00000000
--- a/ESMF/GOCART_GridComp/CFC_GridComp/AMIP/CFC_GridComp_ExtData.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CFC12 NA  N Y - none none CFC-12_EMISSION ExtData/g5chem/sfc/ARCTAS.CFC12.emission.x540_y361.2008.hdf
-%%
-
diff --git a/ESMF/GOCART_GridComp/CFC_GridComp/CFC_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CFC_GridComp/CFC_GridComp_ExtData.rc
deleted file mode 100644
index 7035706f..00000000
--- a/ESMF/GOCART_GridComp/CFC_GridComp/CFC_GridComp_ExtData.rc
+++ /dev/null
@@ -1,8 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CFC12 NA  N Y - none none CFC-12_EMISSION ExtData/g5chem/sfc/ARCTAS.CFC12.emission.x540_y361.2008.hdf
-%%
-
diff --git a/ESMF/GOCART_GridComp/CH4_GridComp/AMIP.20C/CH4_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CH4_GridComp/AMIP.20C/CH4_GridComp_ExtData.rc
deleted file mode 100644
index cd77dc88..00000000
--- a/ESMF/GOCART_GridComp/CH4_GridComp/AMIP.20C/CH4_GridComp_ExtData.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CH4_sfcFluxanimls NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_ANIMLS /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxcoal   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_COAL   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxleak   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_LEAK   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxgasvnt NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_GASVNT /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxhydz   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_HYDZ   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxmsw    NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_MSW    /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxsoilab NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_SOILAB /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtrmite NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TRMITE /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxbogs   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BOGS   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxburn   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BURN   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxricec  NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_RICEC  /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxswamps NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_SWAMPS /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtundra NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TUNDRA /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxbf     NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BF     /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtot    NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TOT    /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_ohanimls      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohcoal        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohleak        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohgasvnt      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohhydz        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohmsw         NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohsoilab      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtrmite      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohbogs        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohburn        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohricec       NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohswamps      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtundra      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohbf          NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtot         NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-#
-CH4_regionMask    NA  N v - none none REGION_MASK ExtData/g5chem/sfc/ARCTAS.region_mask.x540_y361.2008.nc 
-%%
-
diff --git a/ESMF/GOCART_GridComp/CH4_GridComp/AMIP/CH4_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CH4_GridComp/AMIP/CH4_GridComp_ExtData.rc
deleted file mode 100644
index cd77dc88..00000000
--- a/ESMF/GOCART_GridComp/CH4_GridComp/AMIP/CH4_GridComp_ExtData.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CH4_sfcFluxanimls NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_ANIMLS /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxcoal   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_COAL   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxleak   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_LEAK   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxgasvnt NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_GASVNT /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxhydz   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_HYDZ   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxmsw    NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_MSW    /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxsoilab NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_SOILAB /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtrmite NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TRMITE /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxbogs   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BOGS   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxburn   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BURN   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxricec  NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_RICEC  /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxswamps NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_SWAMPS /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtundra NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TUNDRA /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxbf     NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BF     /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtot    NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TOT    /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_ohanimls      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohcoal        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohleak        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohgasvnt      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohhydz        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohmsw         NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohsoilab      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtrmite      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohbogs        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohburn        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohricec       NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohswamps      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtundra      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohbf          NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtot         NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-#
-CH4_regionMask    NA  N v - none none REGION_MASK ExtData/g5chem/sfc/ARCTAS.region_mask.x540_y361.2008.nc 
-%%
-
diff --git a/ESMF/GOCART_GridComp/CH4_GridComp/CH4_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CH4_GridComp/CH4_GridComp_ExtData.rc
deleted file mode 100644
index cd77dc88..00000000
--- a/ESMF/GOCART_GridComp/CH4_GridComp/CH4_GridComp_ExtData.rc
+++ /dev/null
@@ -1,39 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CH4_sfcFluxanimls NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_ANIMLS /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxcoal   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_COAL   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxleak   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_LEAK   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxgasvnt NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_GASVNT /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxhydz   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_HYDZ   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxmsw    NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_MSW    /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxsoilab NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_SOILAB /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtrmite NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TRMITE /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxbogs   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BOGS   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxburn   NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BURN   /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxricec  NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_RICEC  /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxswamps NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_SWAMPS /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtundra NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TUNDRA /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxbf     NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_BF     /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_sfcFluxtot    NA  Y Y %y4-%m2-%d2t12:00:00 none none CH4_TOT    /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/emist_plusCH4WangAposteriori.x288_y181_z72_t12.2006.nc 
-CH4_ohanimls      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohcoal        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohleak        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohgasvnt      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohhydz        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohmsw         NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohsoilab      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtrmite      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohbogs        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohburn        NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohricec       NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohswamps      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtundra      NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohbf          NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc 
-CH4_ohtot         NA  Y Y %y4-%m2-%d2t12:00:00 none none oh         /discover/nobackup/projects/gmao/share/dasilva/fvInput/g5chem/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-#
-CH4_regionMask    NA  N v - none none REGION_MASK ExtData/g5chem/sfc/ARCTAS.region_mask.x540_y361.2008.nc 
-%%
-
diff --git a/ESMF/GOCART_GridComp/CO2_GridComp/AMIP.20C/CO2_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CO2_GridComp/AMIP.20C/CO2_GridComp_ExtData.rc
deleted file mode 100644
index ad06aea5..00000000
--- a/ESMF/GOCART_GridComp/CO2_GridComp/AMIP.20C/CO2_GridComp_ExtData.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-PrimaryExports%%
-# A = Climatology? Y/N; B = Conservative regridding? Y/N
-#---------------+-------------------+-+-+---------------------+--------+--------+------------------------------------   
-# Export        |                   | | |_______ Refresh _____|____ Factors ____|_______ External File __________
-# Name          | Units             |A|B|     Time Template   | Offset | Scale  |  Variable   |      Template
-#---------------+-------------------+-+-+---------------------+--------+--------+-------------+----------------------   
- CO2_BIOMASS     'kg CO2 m-2 s-1'    Y Y F%y4-%m2-%d2t12:00:00 none     none     biomass       ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_co2.x576_y361_t14.%y4.nc4
- CO2_FF          'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2ff       ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
- CO2_NEP         'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2nep      ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
- CO2_OCN         'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2ocn      ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
-
- CO2_CMS_BIOMASS 'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     biomass       ExtData/PIESA/sfc/CMS/em.daily.1x1.25.%y4.nc
- CO2_CMS_FF      'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     emco2ff       ExtData/PIESA/sfc/CMS/ORNL_TRANSCOM.co2_ff_nep_ocn.x288_y181_t12.%y4.nc
- CO2_CMS_NEP     'kg C m-2 s-1'      N Y  P0000-00-00T03:00    none     none     emco2nep      ExtData/PIESA/sfc/CMS/casa.3hr.1x1.25.%y4.nc
- CO2_CMS_OCN     'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     emco2ocn      ExtData/PIESA/sfc/CMS/NOBM_fco2.daily.1x1.25.%y4.nc
-
- CO2_regionMask  NA                  N v   -                   none     none     REGION_MASK   ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-#---------------+-------------------+-+-+---------------------+--------+--------+-------------+----------------------   
-%%
diff --git a/ESMF/GOCART_GridComp/CO2_GridComp/AMIP/CO2_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CO2_GridComp/AMIP/CO2_GridComp_ExtData.rc
deleted file mode 100644
index c1244ab9..00000000
--- a/ESMF/GOCART_GridComp/CO2_GridComp/AMIP/CO2_GridComp_ExtData.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-PrimaryExports%%
-# A = Climatology? Y/N; B = Conservative regridding? Y/N
-#---------------+-------------------+-+-+---------------------+--------+--------+------------------------------------   
-# Export        |                   | | |_______ Refresh _____|____ Factors ____|_______ External File __________
-# Name          | Units             |A|B|     Time Template   | Offset | Scale  |  Variable   |      Template
-#---------------+-------------------+-+-+---------------------+--------+--------+-------------+----------------------   
- CO2_BIOMASS     'kg CO2 m-2 s-1'    Y Y F%y4-%m2-%d2t12:00:00 none     none     biomass       ExtData/PIESA/sfc/QFED/v2.4r6/climatology/qfed2.emis_co2.005.x1152_y721_t12.2003_2012.2007.nc4
- CO2_FF          'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2ff       ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
- CO2_NEP         'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2nep      ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
- CO2_OCN         'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2ocn      ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
-
- CO2_CMS_BIOMASS 'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     biomass       ExtData/PIESA/sfc/CMS/em.daily.1x1.25.%y4.nc
- CO2_CMS_FF      'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     emco2ff       ExtData/PIESA/sfc/CMS/ORNL_TRANSCOM.co2_ff_nep_ocn.x288_y181_t12.%y4.nc
- CO2_CMS_NEP     'kg C m-2 s-1'      N Y  P0000-00-00T03:00    none     none     emco2nep      ExtData/PIESA/sfc/CMS/casa.3hr.1x1.25.%y4.nc
- CO2_CMS_OCN     'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     emco2ocn      ExtData/PIESA/sfc/CMS/NOBM_fco2.daily.1x1.25.%y4.nc
-
- CO2_regionMask  NA                  N v   -                   none     none     REGION_MASK   ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-#---------------+-------------------+-+-+---------------------+--------+--------+-------------+----------------------   
-%%
diff --git a/ESMF/GOCART_GridComp/CO2_GridComp/CO2_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CO2_GridComp/CO2_GridComp_ExtData.rc
deleted file mode 100644
index c1244ab9..00000000
--- a/ESMF/GOCART_GridComp/CO2_GridComp/CO2_GridComp_ExtData.rc
+++ /dev/null
@@ -1,19 +0,0 @@
-PrimaryExports%%
-# A = Climatology? Y/N; B = Conservative regridding? Y/N
-#---------------+-------------------+-+-+---------------------+--------+--------+------------------------------------   
-# Export        |                   | | |_______ Refresh _____|____ Factors ____|_______ External File __________
-# Name          | Units             |A|B|     Time Template   | Offset | Scale  |  Variable   |      Template
-#---------------+-------------------+-+-+---------------------+--------+--------+-------------+----------------------   
- CO2_BIOMASS     'kg CO2 m-2 s-1'    Y Y F%y4-%m2-%d2t12:00:00 none     none     biomass       ExtData/PIESA/sfc/QFED/v2.4r6/climatology/qfed2.emis_co2.005.x1152_y721_t12.2003_2012.2007.nc4
- CO2_FF          'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2ff       ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
- CO2_NEP         'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2nep      ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
- CO2_OCN         'kg C m-2 s-1'      Y Y F%y4-%m2-%d2t12:00:00 none     none     emco2ocn      ExtData/PIESA/sfc/bian.co2.x288_y181_t12.2001.nc
-
- CO2_CMS_BIOMASS 'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     biomass       ExtData/PIESA/sfc/CMS/em.daily.1x1.25.%y4.nc
- CO2_CMS_FF      'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     emco2ff       ExtData/PIESA/sfc/CMS/ORNL_TRANSCOM.co2_ff_nep_ocn.x288_y181_t12.%y4.nc
- CO2_CMS_NEP     'kg C m-2 s-1'      N Y  P0000-00-00T03:00    none     none     emco2nep      ExtData/PIESA/sfc/CMS/casa.3hr.1x1.25.%y4.nc
- CO2_CMS_OCN     'kg C m-2 s-1'      N Y F%y4-%m2-%d2t12:00:00 none     none     emco2ocn      ExtData/PIESA/sfc/CMS/NOBM_fco2.daily.1x1.25.%y4.nc
-
- CO2_regionMask  NA                  N v   -                   none     none     REGION_MASK   ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-#---------------+-------------------+-+-+---------------------+--------+--------+-------------+----------------------   
-%%
diff --git a/ESMF/GOCART_GridComp/CO_GridComp/AMIP.20C/CO_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CO_GridComp/AMIP.20C/CO_GridComp_ExtData.rc
deleted file mode 100755
index 6a662b98..00000000
--- a/ESMF/GOCART_GridComp/CO_GridComp/AMIP.20C/CO_GridComp_ExtData.rc
+++ /dev/null
@@ -1,112 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CO_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 1.11 biomass ExtData/chemistry/HFED/v1.0/Y%y4/hfed.emis_co.x576_y361_t14.%y4.nc4
-CO_OH NA  Y Y %y4-%m2-%d2t12:00:00 none none oh ExtData/PIESA/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-CO_CH4 NA  Y Y %y4-%m2-%d2t12:00:00 none none ch4 ExtData/PIESA/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-CO_BF NA  Y Y %y4-%m2-%d2t12:00:00 none 1.19 emcobf ExtData/PIESA/sfc/co_biofuel_v2.x360_y181_t12.2001.nc
-CO_FS NA  Y Y %y4-%m2-%d2t12:00:00 none 1.20 emcofs ExtData/PIESA/sfc/co_fossilfuel_v2.x360_y181_t12.2001.nc
-CO_ISOP NA  Y Y %y4-%m2-%d2t12:00:00 none 0.2 emcoisop ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-CO_NVOC NA  Y Y %y4-%m2-%d2t12:00:00 none none emconvoc ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-CO_TERP NA  Y Y %y4-%m2-%d2t12:00:00 none none emcoterp ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-
-CO_CH4bbae NA  Y Y - none none ch4 /dev/null
-CO_BFbbae NA  Y Y - none none bf /dev/null
-CO_FSbbae NA  Y Y - none none fs /dev/null
-CO_ISOPbbae NA  Y Y - none none isop /dev/null
-CO_NVOCbbae NA  Y Y - none none nvoc /dev/null
-CO_TERPbbae NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbna NA  Y Y - none none ch4 /dev/null
-CO_BFbbna NA  Y Y - none none bf /dev/null
-CO_FSbbna NA  Y Y - none none fs /dev/null
-CO_ISOPbbna NA  Y Y - none none isop /dev/null
-CO_NVOCbbna NA  Y Y - none none nvoc /dev/null
-CO_TERPbbna NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbla NA  Y Y - none none ch4 /dev/null
-CO_BFbbla NA  Y Y - none none bf /dev/null
-CO_FSbbla NA  Y Y - none none fs /dev/null
-CO_ISOPbbla NA  Y Y - none none isop /dev/null
-CO_NVOCbbla NA  Y Y - none none nvoc /dev/null
-CO_TERPbbla NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbaf NA  Y Y - none none ch4 /dev/null
-CO_BFbbaf NA  Y Y - none none bf /dev/null
-CO_FSbbaf NA  Y Y - none none fs /dev/null
-CO_ISOPbbaf NA  Y Y - none none isop /dev/null
-CO_NVOCbbaf NA  Y Y - none none nvoc /dev/null
-CO_TERPbbaf NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbgl NA  Y Y - none none ch4 /dev/null
-CO_BFbbgl NA  Y Y - none none bf /dev/null
-CO_FSbbgl NA  Y Y - none none fs /dev/null
-CO_ISOPbbgl NA  Y Y - none none isop /dev/null
-CO_NVOCbbgl NA  Y Y - none none nvoc /dev/null
-CO_TERPbbgl NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbna NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbeu NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbas NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbgl NA  Y Y - none none terp /dev/null
-#
-CO_regionMask NA  N V - none none REGION_MASK ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-%%
-
-
-DerivedExports%%
-# ---------|---------|--------------------------------------------|
-#  Export  | Primary |_________________ Mask _____________________|
-#  Name    |  Name   |    Name    |           Expression          |    
-# ---------|---------|------------|-------------------------------|
-# ---------|---------|------------|-------------------------------|
-CO_BIOMASSbbae regionmask(CO_BIOMASS,CO_regionMask;3,9,10) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbna regionmask(CO_BIOMASS,CO_regionMask;1) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbla regionmask(CO_BIOMASS,CO_regionMask;2,6) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbaf regionmask(CO_BIOMASS,CO_regionMask;5) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbgl CO_BIOMASS  %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbna regionmask(CO_CH4,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_BFnbna regionmask(CO_BF,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_FSnbna regionmask(CO_FS,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbna regionmask(CO_ISOP,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbna regionmask(CO_NVOC,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_TERPnbna regionmask(CO_TERP,CO_regionMask;1) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbeu regionmask(CO_CH4,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_BFnbeu regionmask(CO_BF,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_FSnbeu regionmask(CO_FS,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbeu regionmask(CO_ISOP,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbeu regionmask(CO_NVOC,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_TERPnbeu regionmask(CO_TERP,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbas regionmask(CO_CH4,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_BFnbas regionmask(CO_BF,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_FSnbas regionmask(CO_FS,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbas regionmask(CO_ISOP,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbas regionmask(CO_NVOC,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_TERPnbas regionmask(CO_TERP,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbgl CO_CH4 %y4-%m2-%d2t12:00:00 
-CO_BFnbgl CO_BF %y4-%m2-%d2t12:00:00 
-CO_FSnbgl CO_FS %y4-%m2-%d2t12:00:00 
-CO_ISOPnbgl CO_ISOP %y4-%m2-%d2t12:00:00 
-CO_NVOCnbgl CO_NVOC %y4-%m2-%d2t12:00:00 
-CO_TERPnbgl CO_TERP %y4-%m2-%d2t12:00:00
-#
-CO_OHbbae CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbna CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbla CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbaf CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbgl CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbna CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbeu CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbas CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbgl CO_OH %y4-%m2-%d2t12:00:00
-%%
-
diff --git a/ESMF/GOCART_GridComp/CO_GridComp/AMIP/CO_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CO_GridComp/AMIP/CO_GridComp_ExtData.rc
deleted file mode 100755
index f1748325..00000000
--- a/ESMF/GOCART_GridComp/CO_GridComp/AMIP/CO_GridComp_ExtData.rc
+++ /dev/null
@@ -1,112 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CO_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 1.11 biomass ExtData/chemistry/QFED/v2.6r1/sfc/0.1/Y%y4/M%m2/qfed2.emis_co.061.%y4%m2%d2.nc4
-CO_OH NA  Y Y %y4-%m2-%d2t12:00:00 none none oh ExtData/PIESA/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-CO_CH4 NA  Y Y %y4-%m2-%d2t12:00:00 none none ch4 ExtData/PIESA/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-CO_BF NA  Y Y %y4-%m2-%d2t12:00:00 none 1.19 emcobf ExtData/PIESA/sfc/co_biofuel_v2.x360_y181_t12.2001.nc
-CO_FS NA  Y Y %y4-%m2-%d2t12:00:00 none 1.20 emcofs ExtData/PIESA/sfc/co_fossilfuel_v2.x360_y181_t12.2001.nc
-CO_ISOP NA  Y Y %y4-%m2-%d2t12:00:00 none 0.2 emcoisop ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-CO_NVOC NA  Y Y %y4-%m2-%d2t12:00:00 none none emconvoc ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-CO_TERP NA  Y Y %y4-%m2-%d2t12:00:00 none none emcoterp ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-
-CO_CH4bbae NA  Y Y - none none ch4 /dev/null
-CO_BFbbae NA  Y Y - none none bf /dev/null
-CO_FSbbae NA  Y Y - none none fs /dev/null
-CO_ISOPbbae NA  Y Y - none none isop /dev/null
-CO_NVOCbbae NA  Y Y - none none nvoc /dev/null
-CO_TERPbbae NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbna NA  Y Y - none none ch4 /dev/null
-CO_BFbbna NA  Y Y - none none bf /dev/null
-CO_FSbbna NA  Y Y - none none fs /dev/null
-CO_ISOPbbna NA  Y Y - none none isop /dev/null
-CO_NVOCbbna NA  Y Y - none none nvoc /dev/null
-CO_TERPbbna NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbla NA  Y Y - none none ch4 /dev/null
-CO_BFbbla NA  Y Y - none none bf /dev/null
-CO_FSbbla NA  Y Y - none none fs /dev/null
-CO_ISOPbbla NA  Y Y - none none isop /dev/null
-CO_NVOCbbla NA  Y Y - none none nvoc /dev/null
-CO_TERPbbla NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbaf NA  Y Y - none none ch4 /dev/null
-CO_BFbbaf NA  Y Y - none none bf /dev/null
-CO_FSbbaf NA  Y Y - none none fs /dev/null
-CO_ISOPbbaf NA  Y Y - none none isop /dev/null
-CO_NVOCbbaf NA  Y Y - none none nvoc /dev/null
-CO_TERPbbaf NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbgl NA  Y Y - none none ch4 /dev/null
-CO_BFbbgl NA  Y Y - none none bf /dev/null
-CO_FSbbgl NA  Y Y - none none fs /dev/null
-CO_ISOPbbgl NA  Y Y - none none isop /dev/null
-CO_NVOCbbgl NA  Y Y - none none nvoc /dev/null
-CO_TERPbbgl NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbna NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbeu NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbas NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbgl NA  Y Y - none none terp /dev/null
-#
-CO_regionMask NA  N V - none none REGION_MASK ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-%%
-
-
-DerivedExports%%
-# ---------|---------|--------------------------------------------|
-#  Export  | Primary |_________________ Mask _____________________|
-#  Name    |  Name   |    Name    |           Expression          |    
-# ---------|---------|------------|-------------------------------|
-# ---------|---------|------------|-------------------------------|
-CO_BIOMASSbbae regionmask(CO_BIOMASS,CO_regionMask;3,9,10) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbna regionmask(CO_BIOMASS,CO_regionMask;1) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbla regionmask(CO_BIOMASS,CO_regionMask;2,6) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbaf regionmask(CO_BIOMASS,CO_regionMask;5) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbgl CO_BIOMASS  %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbna regionmask(CO_CH4,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_BFnbna regionmask(CO_BF,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_FSnbna regionmask(CO_FS,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbna regionmask(CO_ISOP,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbna regionmask(CO_NVOC,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_TERPnbna regionmask(CO_TERP,CO_regionMask;1) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbeu regionmask(CO_CH4,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_BFnbeu regionmask(CO_BF,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_FSnbeu regionmask(CO_FS,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbeu regionmask(CO_ISOP,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbeu regionmask(CO_NVOC,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_TERPnbeu regionmask(CO_TERP,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbas regionmask(CO_CH4,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_BFnbas regionmask(CO_BF,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_FSnbas regionmask(CO_FS,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbas regionmask(CO_ISOP,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbas regionmask(CO_NVOC,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_TERPnbas regionmask(CO_TERP,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbgl CO_CH4 %y4-%m2-%d2t12:00:00 
-CO_BFnbgl CO_BF %y4-%m2-%d2t12:00:00 
-CO_FSnbgl CO_FS %y4-%m2-%d2t12:00:00 
-CO_ISOPnbgl CO_ISOP %y4-%m2-%d2t12:00:00 
-CO_NVOCnbgl CO_NVOC %y4-%m2-%d2t12:00:00 
-CO_TERPnbgl CO_TERP %y4-%m2-%d2t12:00:00
-#
-CO_OHbbae CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbna CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbla CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbaf CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbgl CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbna CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbeu CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbas CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbgl CO_OH %y4-%m2-%d2t12:00:00
-%%
-
diff --git a/ESMF/GOCART_GridComp/CO_GridComp/CO_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/CO_GridComp/CO_GridComp_ExtData.rc
deleted file mode 100755
index 8294d023..00000000
--- a/ESMF/GOCART_GridComp/CO_GridComp/CO_GridComp_ExtData.rc
+++ /dev/null
@@ -1,112 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-CO_BIOMASS NA  N Y %y4-%m2-%d2t12:00:00 none 1.11 biomass ExtData/chemistry/QFED/v2.5r1-nrt/sfc/0.1/Y%y4/M%m2/qfed2.emis_co.006.%y4%m2%d2.nc4
-CO_OH NA  Y Y %y4-%m2-%d2t12:00:00 none none oh ExtData/PIESA/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-CO_CH4 NA  Y Y %y4-%m2-%d2t12:00:00 none none ch4 ExtData/PIESA/L72/gmi_oh_ch4_h2o2_no3.x144_y91_z72_t12.2006.nc
-CO_BF NA  Y Y %y4-%m2-%d2t12:00:00 none 1.19 emcobf ExtData/PIESA/sfc/co_biofuel_v2.x360_y181_t12.2001.nc
-CO_FS NA  Y Y %y4-%m2-%d2t12:00:00 none 1.20 emcofs ExtData/PIESA/sfc/co_fossilfuel_v2.x360_y181_t12.2001.nc
-CO_ISOP NA  Y Y %y4-%m2-%d2t12:00:00 none 0.2 emcoisop ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-CO_NVOC NA  Y Y %y4-%m2-%d2t12:00:00 none none emconvoc ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-CO_TERP NA  Y Y %y4-%m2-%d2t12:00:00 none none emcoterp ExtData/PIESA/sfc/co_biogenic.x288_y181_t12.2006.nc
-
-CO_CH4bbae NA  Y Y - none none ch4 /dev/null
-CO_BFbbae NA  Y Y - none none bf /dev/null
-CO_FSbbae NA  Y Y - none none fs /dev/null
-CO_ISOPbbae NA  Y Y - none none isop /dev/null
-CO_NVOCbbae NA  Y Y - none none nvoc /dev/null
-CO_TERPbbae NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbna NA  Y Y - none none ch4 /dev/null
-CO_BFbbna NA  Y Y - none none bf /dev/null
-CO_FSbbna NA  Y Y - none none fs /dev/null
-CO_ISOPbbna NA  Y Y - none none isop /dev/null
-CO_NVOCbbna NA  Y Y - none none nvoc /dev/null
-CO_TERPbbna NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbla NA  Y Y - none none ch4 /dev/null
-CO_BFbbla NA  Y Y - none none bf /dev/null
-CO_FSbbla NA  Y Y - none none fs /dev/null
-CO_ISOPbbla NA  Y Y - none none isop /dev/null
-CO_NVOCbbla NA  Y Y - none none nvoc /dev/null
-CO_TERPbbla NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbaf NA  Y Y - none none ch4 /dev/null
-CO_BFbbaf NA  Y Y - none none bf /dev/null
-CO_FSbbaf NA  Y Y - none none fs /dev/null
-CO_ISOPbbaf NA  Y Y - none none isop /dev/null
-CO_NVOCbbaf NA  Y Y - none none nvoc /dev/null
-CO_TERPbbaf NA  Y Y - none none terp /dev/null
-#
-CO_CH4bbgl NA  Y Y - none none ch4 /dev/null
-CO_BFbbgl NA  Y Y - none none bf /dev/null
-CO_FSbbgl NA  Y Y - none none fs /dev/null
-CO_ISOPbbgl NA  Y Y - none none isop /dev/null
-CO_NVOCbbgl NA  Y Y - none none nvoc /dev/null
-CO_TERPbbgl NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbna NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbeu NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbas NA  Y Y - none none terp /dev/null
-#
-CO_BIOMASSnbgl NA  Y Y - none none terp /dev/null
-#
-CO_regionMask NA  N V - none none REGION_MASK ExtData/PIESA/sfc/ARCTAS.region_mask.x540_y361.2008.nc
-%%
-
-
-DerivedExports%%
-# ---------|---------|--------------------------------------------|
-#  Export  | Primary |_________________ Mask _____________________|
-#  Name    |  Name   |    Name    |           Expression          |    
-# ---------|---------|------------|-------------------------------|
-# ---------|---------|------------|-------------------------------|
-CO_BIOMASSbbae regionmask(CO_BIOMASS,CO_regionMask;3,9,10) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbna regionmask(CO_BIOMASS,CO_regionMask;1) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbla regionmask(CO_BIOMASS,CO_regionMask;2,6) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbaf regionmask(CO_BIOMASS,CO_regionMask;5) %y4-%m2-%d2t12:00:00
-CO_BIOMASSbbgl CO_BIOMASS  %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbna regionmask(CO_CH4,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_BFnbna regionmask(CO_BF,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_FSnbna regionmask(CO_FS,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbna regionmask(CO_ISOP,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbna regionmask(CO_NVOC,CO_regionMask;1) %y4-%m2-%d2t12:00:00 
-CO_TERPnbna regionmask(CO_TERP,CO_regionMask;1) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbeu regionmask(CO_CH4,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_BFnbeu regionmask(CO_BF,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_FSnbeu regionmask(CO_FS,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbeu regionmask(CO_ISOP,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbeu regionmask(CO_NVOC,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00 
-CO_TERPnbeu regionmask(CO_TERP,CO_regionMask;3,9) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbas regionmask(CO_CH4,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_BFnbas regionmask(CO_BF,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_FSnbas regionmask(CO_FS,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_ISOPnbas regionmask(CO_ISOP,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_NVOCnbas regionmask(CO_NVOC,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00 
-CO_TERPnbas regionmask(CO_TERP,CO_regionMask;4,10) %y4-%m2-%d2t12:00:00
-#
-CO_CH4nbgl CO_CH4 %y4-%m2-%d2t12:00:00 
-CO_BFnbgl CO_BF %y4-%m2-%d2t12:00:00 
-CO_FSnbgl CO_FS %y4-%m2-%d2t12:00:00 
-CO_ISOPnbgl CO_ISOP %y4-%m2-%d2t12:00:00 
-CO_NVOCnbgl CO_NVOC %y4-%m2-%d2t12:00:00 
-CO_TERPnbgl CO_TERP %y4-%m2-%d2t12:00:00
-#
-CO_OHbbae CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbna CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbla CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbaf CO_OH %y4-%m2-%d2t12:00:00
-CO_OHbbgl CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbna CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbeu CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbas CO_OH %y4-%m2-%d2t12:00:00
-CO_OHnbgl CO_OH %y4-%m2-%d2t12:00:00
-%%
-
diff --git a/ESMF/GOCART_GridComp/O3_GridComp/AMIP.20C/O3_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/O3_GridComp/AMIP.20C/O3_GridComp_ExtData.rc
deleted file mode 100644
index 3f562311..00000000
--- a/ESMF/GOCART_GridComp/O3_GridComp/AMIP.20C/O3_GridComp_ExtData.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-O3_ireg NA  Y Y - none none ireg ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID001 NA  Y Y - none none iuseVegID001 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID002 NA  Y Y - none none iuseVegID002 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID003 NA  Y Y - none none iuseVegID003 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID004 NA  Y Y - none none iuseVegID004 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID005 NA  Y Y - none none iuseVegID005 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID006 NA  Y Y - none none iuseVegID006 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID007 NA  Y Y - none none iuseVegID007 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID008 NA  Y Y - none none iuseVegID008 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID009 NA  Y Y - none none iuseVegID009 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID010 NA  Y Y - none none iuseVegID010 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID011 NA  Y Y - none none iuseVegID011 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID012 NA  Y Y - none none iuseVegID012 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID013 NA  Y Y - none none iuseVegID013 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID014 NA  Y Y - none none iuseVegID014 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID015 NA  Y Y - none none iuseVegID015 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID001 NA  Y Y - none none ilandVegID001 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID002 NA  Y Y - none none ilandVegID002 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID003 NA  Y Y - none none ilandVegID003 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID004 NA  Y Y - none none ilandVegID004 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID005 NA  Y Y - none none ilandVegID005 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID006 NA  Y Y - none none ilandVegID006 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID007 NA  Y Y - none none ilandVegID007 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID008 NA  Y Y - none none ilandVegID008 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID009 NA  Y Y - none none ilandVegID009 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID010 NA  Y Y - none none ilandVegID010 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID011 NA  Y Y - none none ilandVegID011 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID012 NA  Y Y - none none ilandVegID012 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID013 NA  Y Y - none none ilandVegID013 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID014 NA  Y Y - none none ilandVegID014 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID015 NA  Y Y - none none ilandVegID015 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_laiVegID001 NA  Y Y - none none laiVegID001 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID002 NA  Y Y - none none laiVegID002 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID003 NA  Y Y - none none laiVegID003 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID004 NA  Y Y - none none laiVegID004 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID005 NA  Y Y - none none laiVegID005 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID006 NA  Y Y - none none laiVegID006 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID007 NA  Y Y - none none laiVegID007 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID008 NA  Y Y - none none laiVegID008 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID009 NA  Y Y - none none laiVegID009 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID010 NA  Y Y - none none laiVegID010 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID011 NA  Y Y - none none laiVegID011 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID012 NA  Y Y - none none laiVegID012 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID013 NA  Y Y - none none laiVegID013 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID014 NA  Y Y - none none laiVegID014 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID015 NA  Y Y - none none laiVegID015 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-%%
diff --git a/ESMF/GOCART_GridComp/O3_GridComp/AMIP/O3_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/O3_GridComp/AMIP/O3_GridComp_ExtData.rc
deleted file mode 100644
index 3f562311..00000000
--- a/ESMF/GOCART_GridComp/O3_GridComp/AMIP/O3_GridComp_ExtData.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-O3_ireg NA  Y Y - none none ireg ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID001 NA  Y Y - none none iuseVegID001 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID002 NA  Y Y - none none iuseVegID002 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID003 NA  Y Y - none none iuseVegID003 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID004 NA  Y Y - none none iuseVegID004 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID005 NA  Y Y - none none iuseVegID005 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID006 NA  Y Y - none none iuseVegID006 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID007 NA  Y Y - none none iuseVegID007 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID008 NA  Y Y - none none iuseVegID008 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID009 NA  Y Y - none none iuseVegID009 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID010 NA  Y Y - none none iuseVegID010 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID011 NA  Y Y - none none iuseVegID011 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID012 NA  Y Y - none none iuseVegID012 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID013 NA  Y Y - none none iuseVegID013 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID014 NA  Y Y - none none iuseVegID014 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID015 NA  Y Y - none none iuseVegID015 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID001 NA  Y Y - none none ilandVegID001 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID002 NA  Y Y - none none ilandVegID002 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID003 NA  Y Y - none none ilandVegID003 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID004 NA  Y Y - none none ilandVegID004 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID005 NA  Y Y - none none ilandVegID005 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID006 NA  Y Y - none none ilandVegID006 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID007 NA  Y Y - none none ilandVegID007 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID008 NA  Y Y - none none ilandVegID008 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID009 NA  Y Y - none none ilandVegID009 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID010 NA  Y Y - none none ilandVegID010 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID011 NA  Y Y - none none ilandVegID011 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID012 NA  Y Y - none none ilandVegID012 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID013 NA  Y Y - none none ilandVegID013 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID014 NA  Y Y - none none ilandVegID014 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID015 NA  Y Y - none none ilandVegID015 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_laiVegID001 NA  Y Y - none none laiVegID001 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID002 NA  Y Y - none none laiVegID002 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID003 NA  Y Y - none none laiVegID003 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID004 NA  Y Y - none none laiVegID004 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID005 NA  Y Y - none none laiVegID005 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID006 NA  Y Y - none none laiVegID006 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID007 NA  Y Y - none none laiVegID007 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID008 NA  Y Y - none none laiVegID008 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID009 NA  Y Y - none none laiVegID009 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID010 NA  Y Y - none none laiVegID010 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID011 NA  Y Y - none none laiVegID011 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID012 NA  Y Y - none none laiVegID012 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID013 NA  Y Y - none none laiVegID013 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID014 NA  Y Y - none none laiVegID014 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID015 NA  Y Y - none none laiVegID015 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-%%
diff --git a/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90 b/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90
index 0873000f..9e212a27 100644
--- a/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90
+++ b/ESMF/GOCART_GridComp/O3_GridComp/O3_GridCompMod.F90
@@ -636,6 +636,7 @@ SUBROUTINE O3_GridCompRun ( gcO3, w_c, impChem, expChem, &
    REAL, ALLOCATABLE :: dryDepFreq(:,:)
    REAL, ALLOCATABLE :: dO3(:,:)
    INTEGER, ALLOCATABLE :: oro(:,:)
+   REAL, ALLOCATABLE :: tropPa(:,:)
 
    REAL, ALLOCATABLE :: lai2D(:,:)
    CHARACTER(LEN= 3) :: laiID
@@ -889,7 +890,8 @@ SUBROUTINE O3_GridCompRun ( gcO3, w_c, impChem, expChem, &
 
 ! Repair bad tropopause pressures, if any exist
 ! ---------------------------------------------
-   CALL Chem_UtilTroppFixer(i2, j2, tropp, VERBOSE=.TRUE., RC=status)
+   ALLOCATE(tropPa(i1:i2,j1:j2), _STAT)
+   CALL Chem_UtilTroppFixer(i2, j2, tropp, VERBOSE=.TRUE., NEWTROPP=tropPa, RC=status)
    VERIFY_(status)
 
 ! Perform parameterized production and loss chemistry
@@ -1288,13 +1290,14 @@ SUBROUTINE doProdLoss(rc)
    mask = 0
 
    DO k=1,km
-    WHERE(plPa(:,:,k) <= tropp(:,:)) mask(:,:,k) = 1
-    WHERE(tropp(:,:) == MAPL_UNDEF)  mask(:,:,k) = 0
+    WHERE(plPa(:,:,k) <= tropPa(:,:)) mask(:,:,k) = 1
+    WHERE(tropPa(:,:) == MAPL_UNDEF)  mask(:,:,k) = 0
    END DO
   
    n = w_c%reg%i_O3
    WHERE(mask == 1) w_c%qa(n)%data3d = (w_c%qa(n)%data3d + cdt*Pi)/(1.00 + cdt*Li)
    
+   DEALLOCATE(tropPa, _STAT)
    DEALLOCATE(mask, STAT=status)
    VERIFY_(status)
    DEALLOCATE(Pclim, STAT=status)
diff --git a/ESMF/GOCART_GridComp/O3_GridComp/O3_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/O3_GridComp/O3_GridComp_ExtData.rc
deleted file mode 100644
index 3f562311..00000000
--- a/ESMF/GOCART_GridComp/O3_GridComp/O3_GridComp_ExtData.rc
+++ /dev/null
@@ -1,52 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-O3_ireg NA  Y Y - none none ireg ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID001 NA  Y Y - none none iuseVegID001 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID002 NA  Y Y - none none iuseVegID002 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID003 NA  Y Y - none none iuseVegID003 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID004 NA  Y Y - none none iuseVegID004 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID005 NA  Y Y - none none iuseVegID005 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID006 NA  Y Y - none none iuseVegID006 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID007 NA  Y Y - none none iuseVegID007 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID008 NA  Y Y - none none iuseVegID008 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID009 NA  Y Y - none none iuseVegID009 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID010 NA  Y Y - none none iuseVegID010 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID011 NA  Y Y - none none iuseVegID011 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID012 NA  Y Y - none none iuseVegID012 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID013 NA  Y Y - none none iuseVegID013 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID014 NA  Y Y - none none iuseVegID014 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_iuseVegID015 NA  Y Y - none none iuseVegID015 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID001 NA  Y Y - none none ilandVegID001 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID002 NA  Y Y - none none ilandVegID002 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID003 NA  Y Y - none none ilandVegID003 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID004 NA  Y Y - none none ilandVegID004 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID005 NA  Y Y - none none ilandVegID005 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID006 NA  Y Y - none none ilandVegID006 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID007 NA  Y Y - none none ilandVegID007 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID008 NA  Y Y - none none ilandVegID008 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID009 NA  Y Y - none none ilandVegID009 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID010 NA  Y Y - none none ilandVegID010 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID011 NA  Y Y - none none ilandVegID011 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID012 NA  Y Y - none none ilandVegID012 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID013 NA  Y Y - none none ilandVegID013 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID014 NA  Y Y - none none ilandVegID014 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_ilandVegID015 NA  Y Y - none none ilandVegID015 ExtData/g5chem/sfc/vegetationType_GMI.x288_y181_t12.2006.nc
-O3_laiVegID001 NA  Y Y - none none laiVegID001 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID002 NA  Y Y - none none laiVegID002 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID003 NA  Y Y - none none laiVegID003 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID004 NA  Y Y - none none laiVegID004 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID005 NA  Y Y - none none laiVegID005 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID006 NA  Y Y - none none laiVegID006 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID007 NA  Y Y - none none laiVegID007 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID008 NA  Y Y - none none laiVegID008 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID009 NA  Y Y - none none laiVegID009 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID010 NA  Y Y - none none laiVegID010 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID011 NA  Y Y - none none laiVegID011 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID012 NA  Y Y - none none laiVegID012 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID013 NA  Y Y - none none laiVegID013 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID014 NA  Y Y - none none laiVegID014 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-O3_laiVegID015 NA  Y Y - none none laiVegID015 ExtData/g5chem/sfc/leafAreaIndex_GMI.x288_y181_t12.2006.nc
-%%
diff --git a/ESMF/GOCART_GridComp/Rn_GridComp/AMIP.20C/Rn_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/Rn_GridComp/AMIP.20C/Rn_GridComp_ExtData.rc
deleted file mode 100644
index acb6e571..00000000
--- a/ESMF/GOCART_GridComp/Rn_GridComp/AMIP.20C/Rn_GridComp_ExtData.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-Rn_EMISSION NA  Y Y %y4-%m2-%d2t12:00:00 none none Rn_EMISSION ExtData/g5chem/sfc/gocart.radon.x540_y361.nc
-RN_regionMask NA  N V - none none REGION_MASK ExtData/g5chem/sfc/RADON.region_mask.x540_y361.2001.nc
-%%
-
-DerivedExports%%
-Rn_EMISSIONAfri regionmask(Rn_EMISSION,Rn_regionMask;5) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONAsia regionmask(Rn_EMISSION,Rn_regionMask;4) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONAust regionmask(Rn_EMISSION,Rn_regionMask;7) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONEuro regionmask(Rn_EMISSION,Rn_regionMask;3) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONSoAm regionmask(Rn_EMISSION,Rn_regionMask;6) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONNoAm regionmask(Rn_EMISSION,Rn_regionMask;1,2) %y4-%m2-%d2t12:00:00
-%%
diff --git a/ESMF/GOCART_GridComp/Rn_GridComp/AMIP/Rn_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/Rn_GridComp/AMIP/Rn_GridComp_ExtData.rc
deleted file mode 100644
index acb6e571..00000000
--- a/ESMF/GOCART_GridComp/Rn_GridComp/AMIP/Rn_GridComp_ExtData.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-Rn_EMISSION NA  Y Y %y4-%m2-%d2t12:00:00 none none Rn_EMISSION ExtData/g5chem/sfc/gocart.radon.x540_y361.nc
-RN_regionMask NA  N V - none none REGION_MASK ExtData/g5chem/sfc/RADON.region_mask.x540_y361.2001.nc
-%%
-
-DerivedExports%%
-Rn_EMISSIONAfri regionmask(Rn_EMISSION,Rn_regionMask;5) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONAsia regionmask(Rn_EMISSION,Rn_regionMask;4) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONAust regionmask(Rn_EMISSION,Rn_regionMask;7) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONEuro regionmask(Rn_EMISSION,Rn_regionMask;3) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONSoAm regionmask(Rn_EMISSION,Rn_regionMask;6) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONNoAm regionmask(Rn_EMISSION,Rn_regionMask;1,2) %y4-%m2-%d2t12:00:00
-%%
diff --git a/ESMF/GOCART_GridComp/Rn_GridComp/Rn_GridComp_ExtData.rc b/ESMF/GOCART_GridComp/Rn_GridComp/Rn_GridComp_ExtData.rc
deleted file mode 100644
index acb6e571..00000000
--- a/ESMF/GOCART_GridComp/Rn_GridComp/Rn_GridComp_ExtData.rc
+++ /dev/null
@@ -1,17 +0,0 @@
-PrimaryExports%%
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-#  Import      |       |       | Regrid |        Refresh       | OffSet | Scale  | Variable On |   File   |
-#  Name        | Units | Clim  | Method |     Time Template    | Factor | Factor |     File    | Template |
-# -------------|-------|-------|--------|----------------------|--------|--------|-------------|----------|
-Rn_EMISSION NA  Y Y %y4-%m2-%d2t12:00:00 none none Rn_EMISSION ExtData/g5chem/sfc/gocart.radon.x540_y361.nc
-RN_regionMask NA  N V - none none REGION_MASK ExtData/g5chem/sfc/RADON.region_mask.x540_y361.2001.nc
-%%
-
-DerivedExports%%
-Rn_EMISSIONAfri regionmask(Rn_EMISSION,Rn_regionMask;5) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONAsia regionmask(Rn_EMISSION,Rn_regionMask;4) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONAust regionmask(Rn_EMISSION,Rn_regionMask;7) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONEuro regionmask(Rn_EMISSION,Rn_regionMask;3) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONSoAm regionmask(Rn_EMISSION,Rn_regionMask;6) %y4-%m2-%d2t12:00:00
-Rn_EMISSIONNoAm regionmask(Rn_EMISSION,Rn_regionMask;1,2) %y4-%m2-%d2t12:00:00
-%%
diff --git a/ESMF/Shared/CMakeLists.txt b/ESMF/Shared/CMakeLists.txt
index e9a3f721..4763e354 100644
--- a/ESMF/Shared/CMakeLists.txt
+++ b/ESMF/Shared/CMakeLists.txt
@@ -12,10 +12,12 @@ if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/@GSW )
     set (gsw_ECBUILD_SYSTEM_INCLUDED TRUE)
 endif()
 
-if ( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/MAPL@ )
-  esma_add_subdirectories (
-    MAPL
-    )
+if (NOT TARGET MAPL)
+  if ( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/MAPL@ )
+    esma_add_subdirectories (
+      MAPL
+      )
+  endif ()
 endif ()
 
 if ( IS_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/GMAO_Shared@ )
diff --git a/ESMF/Shared/Chem_AeroGeneric.F90 b/ESMF/Shared/Chem_AeroGeneric.F90
index e1da972b..a0f8bbb1 100644
--- a/ESMF/Shared/Chem_AeroGeneric.F90
+++ b/ESMF/Shared/Chem_AeroGeneric.F90
@@ -7,8 +7,8 @@
 !BOP
 !
 
-! !MODULE: Chem_AeroGeneric - Utilitarian subroutines used by GOCART2G children. 
-!                             
+! !MODULE: Chem_AeroGeneric - Utilitarian subroutines used by GOCART2G children.
+!
 !
 ! !INTERFACE:
 !
@@ -48,7 +48,7 @@ module  Chem_AeroGeneric
 !====================================================================================
   subroutine add_aero (state, label, label2, grid, typekind, ptr, rc)
 
-!   Description: Adds fields to aero state for aerosol optics calcualtions. 
+!   Description: Adds fields to aero state for aerosol optics calcualtions.
 
     implicit none
 
@@ -109,7 +109,7 @@ recursive subroutine determine_data_driven(COMP_NAME, data_driven, RC)
 
      __Iam__('determine_data_driven')
 
-!   Begin... 
+!   Begin...
 
 !   Is DU data driven?
 !   ------------------
@@ -142,7 +142,7 @@ subroutine append_to_bundle(varName, providerState, prefix, bundle, rc)
     integer               :: dimCount, i
     real, pointer         :: orig_ptr(:,:,:)
     real, pointer         :: ptr2d(:,:)
-    character(len=ESMF_MAXSTR)  :: bin_index, varNameNew
+    character(len=ESMF_MAXSTR)  :: bin_index, varNameNew, units, longname
 
 !   Description: Adds deposition variables to deposition bundle
 
@@ -155,18 +155,25 @@ subroutine append_to_bundle(varName, providerState, prefix, bundle, rc)
     call ESMF_FieldGet (field, dimCount=dimCount, __RC__)
 
     if (dimCount == 2) then ! this handles data instances
-       call MAPL_FieldBundleAdd (bundle, field, __RC__) 
+       call MAPL_FieldBundleAdd (bundle, field, __RC__)
 
     else if (dimCount == 3) then ! this handles computational instances
        call ESMF_FieldGet (field, grid=grid, __RC__)
        call MAPL_GetPointer (providerState, orig_ptr, trim(prefix)//trim(varName), __RC__)
+       call ESMF_AttributeGet(field, name='UNITS',     value=units, __RC__)
+       call ESMF_AttributeGet(field, name='LONG_NAME', value=longname, __RC__)
+       longname=longname(1:index(trim(longname), '(Bin')-1)
 
        if ((index(trim(varname), 'DU') > 0) .or. (index(trim(varname), 'SS') > 0)) then
           do i = 1, size(orig_ptr, 3)
              write (bin_index,'(A, I0.3)') '', i
              ptr2d => orig_ptr(:,:,i)
-             field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farrayPtr=ptr2d,&
-                                        name=trim(varName)//trim(bin_index) , __RC__)
+             field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farray=ptr2d,&
+                                        name=trim(varName)//trim(bin_index) , indexflag=ESMF_INDEX_DELOCAL, __RC__)
+             call ESMF_AttributeSet(field2d, name='DIMS',      value=MAPL_DimsHorzOnly, _RC)
+             call ESMF_AttributeSet(field2d, name='VLOCATION', value=MAPL_VLocationNone, _RC)
+             call ESMF_AttributeSet(field2d, name='UNITS',     value=trim(units), _RC)
+             call ESMF_AttributeSet(field2d, name='LONG_NAME', value=trim(longname)//' Bin '//trim(bin_index), _RC)
              call MAPL_AllocateCoupling (field2D, __RC__)
              call MAPL_FieldBundleAdd (bundle, field2D, __RC__)
           end do
@@ -174,8 +181,12 @@ subroutine append_to_bundle(varName, providerState, prefix, bundle, rc)
 
        if (index(trim(varname), 'SU') > 0) then ! only use SO4, which is the 3rd index
           ptr2d => orig_ptr(:,:,3)
-          field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farrayPtr=ptr2d,&
-                                     name=trim(varName)//'003' , __RC__)
+          field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farray=ptr2d,&
+                                     name=trim(varName)//'003' , indexflag=ESMF_INDEX_DELOCAL, __RC__)
+          call ESMF_AttributeSet(field2d, name='DIMS',      value=MAPL_DimsHorzOnly, _RC)
+          call ESMF_AttributeSet(field2d, name='VLOCATION', value=MAPL_VLocationNone, _RC)
+          call ESMF_AttributeSet(field2d, name='UNITS',     value=units, _RC)
+          call ESMF_AttributeSet(field2d, name='LONG_NAME', value=trim(longname)//' Bin 003', _RC)
           call MAPL_AllocateCoupling (field2D, __RC__)
           call MAPL_FieldBundleAdd (bundle, field2D, __RC__)
        end if
@@ -185,8 +196,12 @@ subroutine append_to_bundle(varName, providerState, prefix, bundle, rc)
              write (bin_index,'(A, I0.3)') '', i
              ptr2d => orig_ptr(:,:,i)
              varNameNew = 'OC'//varName(6:7)
-             field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farrayPtr=ptr2d,&
-                                        name=trim(varNameNew)//trim(bin_index) , __RC__)
+             field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farray=ptr2d,&
+                                        name=trim(varNameNew)//trim(bin_index) , indexflag=ESMF_INDEX_DELOCAL, __RC__)
+             call ESMF_AttributeSet(field2d, name='DIMS',      value=MAPL_DimsHorzOnly, _RC)
+             call ESMF_AttributeSet(field2d, name='VLOCATION', value=MAPL_VLocationNone, _RC)
+             call ESMF_AttributeSet(field2d, name='UNITS',     value=units, _RC)
+             call ESMF_AttributeSet(field2d, name='LONG_NAME', value=trim(longname)//' Bin '//trim(bin_index), _RC)
              call MAPL_AllocateCoupling (field2D, __RC__)
              call MAPL_FieldBundleAdd (bundle, field2D, __RC__)
           end do
@@ -197,8 +212,12 @@ subroutine append_to_bundle(varName, providerState, prefix, bundle, rc)
              write (bin_index,'(A, I0.3)') '', i
              ptr2d => orig_ptr(:,:,i)
              varNameNew = 'BC'//varName(6:7)
-             field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farrayPtr=ptr2d,&
-                                        name=trim(varNameNew)//trim(bin_index) , __RC__)
+             field2D = ESMF_FieldCreate(grid=grid, datacopyflag=ESMF_DATACOPY_REFERENCE, farray=ptr2d,&
+                                        name=trim(varNameNew)//trim(bin_index) , indexflag=ESMF_INDEX_DELOCAL, __RC__)
+             call ESMF_AttributeSet(field2d, name='DIMS',      value=MAPL_DimsHorzOnly, _RC)
+             call ESMF_AttributeSet(field2d, name='VLOCATION', value=MAPL_VLocationNone, _RC)
+             call ESMF_AttributeSet(field2d, name='UNITS',     value=units, _RC)
+             call ESMF_AttributeSet(field2d, name='LONG_NAME', value=trim(longname)//' Bin '//trim(bin_index), _RC)
              call MAPL_AllocateCoupling (field2D, __RC__)
              call MAPL_FieldBundleAdd (bundle, field2D, __RC__)
           end do
@@ -206,7 +225,7 @@ subroutine append_to_bundle(varName, providerState, prefix, bundle, rc)
 
     else if (dimCount > 3) then
        if(mapl_am_i_root()) print*,'Chem_AeroGenric::append_to_bundle does not currently support fields greater than 3 dimensions'
-       VERIFY_(824)       
+       VERIFY_(824)
     end if
 
     RETURN_(ESMF_SUCCESS)
@@ -232,7 +251,7 @@ subroutine setZeroKlid(km, klid, int_ptr)
 !
 ! !REVISION HISTORY:
 !
-! 25Aug2020 E.Sherman - Written 
+! 25Aug2020 E.Sherman - Written
 !
 ! !Local Variables
    integer :: k
@@ -269,7 +288,7 @@ subroutine setZeroKlid4d (km, klid, int_ptr)
 !
 ! !REVISION HISTORY:
 !
-! 25Aug2020 E.Sherman - Written 
+! 25Aug2020 E.Sherman - Written
 !
 ! !Local Variables
    integer :: k, n
@@ -312,7 +331,7 @@ subroutine findKlid (klid, plid, ple, rc)
 !
 ! !REVISION HISTORY:
 !
-! 25Aug2020 E.Sherman - Written 
+! 25Aug2020 E.Sherman - Written
 !
 ! !Local Variables
    integer :: k, j, i
diff --git a/Process_Library/GOCART2G_MieMod.F90 b/Process_Library/GOCART2G_MieMod.F90
index a595d8d4..572963d7 100644
--- a/Process_Library/GOCART2G_MieMod.F90
+++ b/Process_Library/GOCART2G_MieMod.F90
@@ -1,3 +1,4 @@
+#include "Process.H"
 !BOP
 !
 ! !MODULE:  GOCART2G_MieMod --- Reader for aerosol mie tables
@@ -290,7 +291,7 @@ type(GOCART2G_Mie) function GOCART2G_MieCreate ( MieFile, wavelengths, nmom, rc
       endif
 
 !     Dry particle density (will be pulled from wet particle radius)
-      rc = nf90_inq_varid(ncid,'rhop',ivarid)
+      rc = nf90_inq_varid(ncid,'rhod',ivarid)
       if(rc .ne. NF90_NOERR) then   ! not in table, fill in dummy variable
         rhod_table = -999.
       else
@@ -540,13 +541,15 @@ integer function getChannel(this, wavelength, rc) result (ch)
        endif
     enddo
 
-    if (present(rc)) rc = 0
-
-    if (ch < 0) then
-       !$omp critical (GetCha)
-       print*, "wavelength of ",wavelength, " is an invalid value."
-       !$omp end critical (GetCha)
-       if (present(rc)) rc = -1
+    if (present(rc)) then
+       if (ch > 0) then
+          rc = __SUCCESS__
+       else
+          rc = __FAIL__
+          !$omp critical (GetCha)
+          print*, "wavelength of ",wavelength, " is an invalid value."
+          !$omp end critical (GetCha)
+       endif
     endif
 
   end function getChannel
@@ -558,18 +561,22 @@ real function getWavelength(this, ith_channel, rc) result (wavelength)
      real, parameter :: w_tol = 1.e-9
      integer :: i
 
-     if (present(rc)) rc = 0
-
      if (ith_channel <=0 .or. ith_channel > this%nch ) then
-       !$omp critical (GetWav)
-       print*, "The channel of ",ith_channel, " is an invalid channel number."
-       !$omp end critical (GetWav)
-       if (present(rc)) rc = -1
-       wavelength = -1. ! meanlingless nagative
-       return
+        wavelength = -1. ! meaningless negative
+     else
+        wavelength = this%wavelengths(ith_channel)
      endif
-     
-     wavelength = this%wavelengths(ith_channel)
+
+    if (present(rc)) then
+       if (wavelength > 0) then
+          rc = __SUCCESS__
+       else
+          rc = __FAIL__
+          !$omp critical (GetWav)
+          print*, "The channel of ",ith_channel, " is an invalid channel number."
+          !$omp end critical (GetWav)
+       endif
+    endif
 
   end function getWavelength
 
diff --git a/Process_Library/GOCART2G_Process.F90 b/Process_Library/GOCART2G_Process.F90
index 97fd09cc..243d03bc 100644
--- a/Process_Library/GOCART2G_Process.F90
+++ b/Process_Library/GOCART2G_Process.F90
@@ -1,13 +1,4 @@
-#define __SUCCESS__ 0
-#define __FAIL__ 1
-#define __VERIFY__(x) if(x/=0) then; if(present(rc)) rc=x; return; endif
-#define __VERIFY_NO_OPT__(x) if(x/=0) then; rc=x; return; endif
-#define __RC__ rc=status); __VERIFY__(status
-#define __RC_NO_OPT__ rc=status); __VERIFY_NO_OPT__(status
-#define __STAT__ stat=status); __VERIFY__(status
-#define __IOSTAT__ iostat=status); __VERIFY__(status
-#define __RETURN__(x) if (present(rc)) rc=x; return
-#define __ASSERT__(expr) if(.not. (expr)) then; if (present(rc)) rc=-1; return; endif
+#include "Process.H"
 !-------------------------------------------------------------------------
 !
 ! !MODULE: GOCART2G_Process -- GOCART2G process library
@@ -178,7 +169,7 @@ end subroutine DustAerosolDistributionKok
 ! !IROUTINE: soilMoistureConvertVol2Grav - volumetric to gravimetric soil moisture
 !
 ! !INTERFACE:
-   real function soilMoistureConvertVol2Grav(vsoil, sandfrac, rhop)
+   real function soilMoistureConvertVol2Grav(vsoil, sandfrac)
 
 ! !USES:
    implicit NONE
@@ -186,7 +177,6 @@ real function soilMoistureConvertVol2Grav(vsoil, sandfrac, rhop)
 ! !INPUT PARAMETERS:
    real, intent(in) :: vsoil       ! volumetric soil moisture fraction [1]
    real, intent(in) :: sandfrac    ! fractional sand content [1]
-   real, intent(in) :: rhop        ! dry dust density [kg m-3]
 
 ! !DESCRIPTION: Convert soil moisture fraction from volumetric to gravimetric.
 !
@@ -200,16 +190,16 @@ real function soilMoistureConvertVol2Grav(vsoil, sandfrac, rhop)
 
 !  !CONSTANTS:
    real, parameter :: rhow = 1000.    ! density of water [kg m-3]
-
+   real, parameter :: rhop = 1700. 
 !EOP
 !-------------------------------------------------------------------------
 !  Begin...
 
 !  Saturated volumetric water content (sand-dependent) ! [m3 m-3]
-   vsat = 0.489 - 0.00126 * ( 100. * sandfrac )
+   vsat = 0.489 - 0.126 * sandfrac 
 
 !  Gravimetric soil content
-   soilMoistureConvertVol2Grav = vsoil * rhow / (rhop * (1. - vsat))
+   soilMoistureConvertVol2Grav = 100. * vsoil * rhow / (rhop * (1. - vsat))
 
    end function soilMoistureConvertVol2Grav
 
@@ -219,7 +209,7 @@ end function soilMoistureConvertVol2Grav
 ! !IROUTINE: moistureCorrectionFecan - Correction factor for Fecan soil moisture
 !
 ! !INTERFACE:
-   real function moistureCorrectionFecan(slc, sand, clay, rhop)
+   real function moistureCorrectionFecan(slc, sand, clay, b)
 
 ! !USES:
    implicit NONE
@@ -228,7 +218,7 @@ real function moistureCorrectionFecan(slc, sand, clay, rhop)
    real, intent(in) :: slc     ! liquid water content of top soil layer, volumetric fraction [1]
    real, intent(in) :: sand    ! fractional sand content [1]
    real, intent(in) :: clay    ! fractional clay content [1]
-   real, intent(in) :: rhop    ! dry dust density [kg m-3]
+   real, intent(in) :: b       ! drylimit factor from zender 2003 
 
 ! !DESCRIPTION: Compute correction factor to account for Fecal soil moisture
 !
@@ -246,10 +236,10 @@ real function moistureCorrectionFecan(slc, sand, clay, rhop)
 !  Begin...
 
 !  Convert soil moisture from volumetric to gravimetric
-   grvsoilm = soilMoistureConvertVol2Grav(slc, sand, rhop)
+   grvsoilm = soilMoistureConvertVol2Grav(slc, sand)
 
 !  Compute fecan dry limit
-   drylimit = clay * (14.0 * clay + 17.0)
+   drylimit = b * clay * (14.0 * clay + 17.0)
 
 !  Compute soil moisture correction
    moistureCorrectionFecan = sqrt(1.0 + 1.21 * max(0., grvsoilm - drylimit)**0.68)
@@ -303,7 +293,7 @@ end function DustFluxV2HRatioMB95
 ! !INTERFACE:
    subroutine DustEmissionFENGSHA(fraclake, fracsnow, oro, slc, clay, sand, silt,  &
                                   ssm, rdrag, airdens, ustar, uthrs, alpha, gamma, &
-                                  kvhmax, grav, rhop, distribution, emissions, rc)
+                                  kvhmax, grav, rhop, distribution, drylimit_factor, moist_correct, emissions, rc)
 
 ! !USES:
    implicit NONE
@@ -327,7 +317,8 @@ subroutine DustEmissionFENGSHA(fraclake, fracsnow, oro, slc, clay, sand, silt,
    real,                 intent(in) :: grav     ! gravity [m/sec^2]
    real, dimension(:),   intent(in) :: rhop            ! soil class density [kg/m^3]
    real, dimension(:),   intent(in) :: distribution    ! normalized dust binned distribution [1]
-
+   real,                 intent(in) :: drylimit_factor ! drylimit tuning factor from zender2003 
+   real,                 intent(in) :: moist_correct   ! moisture correction factor
 ! !OUTPUT PARAMETERS:
    real,    intent(out) :: emissions(:,:,:)     ! binned surface emissions [kg/(m^2 sec)]
    integer, intent(out) :: rc                   ! Error return code: __SUCCESS__ or __FAIL__
@@ -352,6 +343,7 @@ subroutine DustEmissionFENGSHA(fraclake, fracsnow, oro, slc, clay, sand, silt,
    real                  :: rustar
    real                  :: total_emissions
    real                  :: u_sum, u_thresh
+   real                  :: smois
 
 ! !CONSTANTS:
    real, parameter       :: ssm_thresh = 1.e-02    ! emit above this erodibility threshold [1]
@@ -405,24 +397,25 @@ subroutine DustEmissionFENGSHA(fraclake, fracsnow, oro, slc, clay, sand, silt,
          !  Compute threshold wind friction velocity using drag partition
          !  -------------------------------------------------------------
          rustar = rdrag(i,j) * ustar(i,j)
-
+         
+         ! Fecan moisture correction
+         ! -------------------------
+         smois = slc(i,j) * moist_correct
+         h = moistureCorrectionFecan(smois, sand(i,j), clay(i,j), drylimit_factor)
+
+         ! Adjust threshold
+         ! ----------------
+         u_thresh = uthrs(i,j) * h
+         
+         u_sum = rustar + u_thresh
+         
+         ! Compute Horizontal Saltation Flux according to Eq (9) in Webb et al. (2020)
+         ! ---------------------------------------------------------------------------
+         q = max(0., rustar - u_thresh) * u_sum * u_sum
+         
          !  Now compute size-dependent total emission flux
          !  ----------------------------------------------
          do n = 1, nbins
-           ! Fecan moisture correction
-           ! -------------------------
-           h = moistureCorrectionFecan(slc(i,j), sand(i,j), clay(i,j), rhop(n))
-
-           ! Adjust threshold
-           ! ----------------
-           u_thresh = uthrs(i,j) * h
-
-           u_sum = rustar + u_thresh
-
-           ! Compute Horizontal Saltation Flux according to Eq (9) in Webb et al. (2020)
-           ! ---------------------------------------------------------------------------
-           q = max(0., rustar - u_thresh) * u_sum * u_sum
-
            ! Distribute emissions to bins and convert to mass flux (kg s-1)
            ! --------------------------------------------------------------
            emissions(i,j,n) = distribution(n) * total_emissions * q
diff --git a/Process_Library/MieQuery.H b/Process_Library/MieQuery.H
index 86abd73b..2e2c6e9e 100644
--- a/Process_Library/MieQuery.H
+++ b/Process_Library/MieQuery.H
@@ -134,6 +134,10 @@
        gf =  __RHINTERP2__(this%gf, irh, arh, bin, gf)
      endif
 
+     if(present(rhop)) then
+       rhop =  __RHINTERP2__(this%rhop, irh, arh, bin, rhop)
+     endif
+
      if(present(rhod)) then
        rhod =  __RHINTERP2__(this%rhod, irh, arh, bin, rhod)
      endif
diff --git a/Process_Library/Process.H b/Process_Library/Process.H
new file mode 100644
index 00000000..fa74ee6c
--- /dev/null
+++ b/Process_Library/Process.H
@@ -0,0 +1,10 @@
+#define __SUCCESS__ 0
+#define __FAIL__ 1
+#define __VERIFY__(x) if(x/=0) then; if(present(rc)) rc=x; return; endif
+#define __VERIFY_NO_OPT__(x) if(x/=0) then; rc=x; return; endif
+#define __RC__ rc=status); __VERIFY__(status
+#define __RC_NO_OPT__ rc=status); __VERIFY_NO_OPT__(status
+#define __STAT__ stat=status); __VERIFY__(status
+#define __IOSTAT__ iostat=status); __VERIFY__(status
+#define __RETURN__(x) if (present(rc)) rc=x; return
+#define __ASSERT__(expr) if(.not. (expr)) then; if (present(rc)) rc=-1; return; endif
diff --git a/components.yaml b/components.yaml
index 81aa3128..5330f040 100644
--- a/components.yaml
+++ b/components.yaml
@@ -5,13 +5,13 @@ GOCART:
 env:
   local: ./env@
   remote: ../ESMA_env.git
-  tag: v4.9.1
+  tag: v4.29.0
   develop: main
 
 cmake:
   local: ./cmake@
   remote: ../ESMA_cmake.git
-  tag: v3.28.0
+  tag: v3.48.0
   develop: develop
 
 ecbuild:
@@ -28,12 +28,12 @@ HEMCO:
 GMAO_Shared:
   local: ./ESMF/Shared/GMAO_Shared@
   remote: ../GMAO_Shared.git
-  tag: v1.9.0
+  tag: v1.9.8
   sparse: ./config/GMAO_Shared.sparse
   develop: main
 
 MAPL:
   local: ./ESMF/Shared/MAPL@
   remote: ../MAPL.git
-  tag: v2.38.1
+  tag: v2.47.1
   develop: develop