diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4968ba8..bd3d80f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,12 +10,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Added
 - Added Cloud-J subdirectory and CMake updates for Cloud-J repository
+- Added HETP subdirectory and CMake updates for new HETP submodule
 
 ### Removed
 
 ### Changed
 - Removed variable WLI from HEMCO grid comp module for compatibility with HEMCO v3.8
 - Updating CMakeLists in GEOSCHEMchem to copy all rc and yaml files to install/etc needed to run GEOS with GEOS-Chem
+- Updated subroutine call in HEMCO_GridCompMod.F90 for compatibility with HEMCO 3.10.1
+- Updated CMakeLists.txt for Cloud-J for compatibility with Cloud-J 8.0.1
 
 ### Fixed
 
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f1a19af..f04ee94 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 esma_set_this ()
 
-esma_add_subdirectories(Shared GOCART Cloud-J)
+esma_add_subdirectories(Shared GOCART Cloud-J HETP)
 
 set (alldirs
   GEOSpchem_GridComp
diff --git a/Cloud-J/CMakeLists.txt b/Cloud-J/CMakeLists.txt
index 296518f..57e88a6 100644
--- a/Cloud-J/CMakeLists.txt
+++ b/Cloud-J/CMakeLists.txt
@@ -6,12 +6,12 @@ set (MODEL_GEOSCHEM TRUE) # Will need to rework to use with GMI instead
 set (MAPL_ESMF TRUE)
 
 set (srcs
-   ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_sub_mod.F90
    ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_cmn_mod.F90
    ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_error_mod.F90
-   ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_init_mod.F90
+   ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_fjx_osa_mod.F90
    ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_fjx_sub_mod.F90
-   ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_osa_sub_mod.F90
+   ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_init_mod.F90
+   ${CMAKE_CURRENT_SOURCE_DIR}/${cloud_j_dir}/src/Core/cldj_sub_mod.F90
    )
 
 # placeholder for excluding files from build
diff --git a/GEOSCHEMchem_GridComp/CMakeLists.txt b/GEOSCHEMchem_GridComp/CMakeLists.txt
index fa19b64..17185b4 100644
--- a/GEOSCHEMchem_GridComp/CMakeLists.txt
+++ b/GEOSCHEMchem_GridComp/CMakeLists.txt
@@ -76,7 +76,7 @@ endif ()
 
 esma_add_library (${this}
    SRCS ${srcs}
-   DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base Chem_Shared HEMCO Cloud-J
+   DEPENDENCIES MAPL MAPL_cfio_r4 Chem_Base Chem_Shared HEMCO Cloud-J HETP
                 OpenMP::OpenMP_Fortran esmf NetCDF::NetCDF_Fortran
    )
 
diff --git a/HEMCO_GridComp/HEMCO_GridCompMod.F90 b/HEMCO_GridComp/HEMCO_GridCompMod.F90
index d41461e..4e13ea8 100644
--- a/HEMCO_GridComp/HEMCO_GridCompMod.F90
+++ b/HEMCO_GridComp/HEMCO_GridCompMod.F90
@@ -807,6 +807,7 @@ SUBROUTINE HEMCOinit_( GC, Import, Export, Clock, Inst, RC )
     REAL(ESMF_KIND_R8)              :: s_r8
 
     INTEGER                         :: HCRC
+    INTEGER                         :: LUN
 
     ! For MAPL/ESMF error handling (defined Iam and STATUS)
     __Iam__('HEMCOinit_ (GEOS_EmisGridComp.F90)') 
@@ -820,7 +821,7 @@ SUBROUTINE HEMCOinit_( GC, Import, Export, Clock, Inst, RC )
     ! ------------------------------------------------------------------
 
     IF ( MAPL_Am_I_Root() ) THEN
-       CALL HCO_LogFile_Open( Inst%HcoConfig%Err, RC = HCRC )
+       CALL HCO_LogFile_Open( Inst%HcoConfig%Err, .true., HCRC, LUN )
        _ASSERT(HCRC==HCO_SUCCESS,'needs informative message')
     ENDIF
 
diff --git a/HETP/CMakeLists.txt b/HETP/CMakeLists.txt
new file mode 100644
index 0000000..e106320
--- /dev/null
+++ b/HETP/CMakeLists.txt
@@ -0,0 +1,12 @@
+esma_set_this ()
+
+esma_mepo_style(HETP hetp_dir)
+
+set (srcs
+   ${CMAKE_CURRENT_SOURCE_DIR}/${hetp_dir}/src/Core/hetp_mod.F90
+   ${CMAKE_CURRENT_SOURCE_DIR}/${hetp_dir}/src/Core/mach_hetp_mod.F90
+   )
+
+esma_add_library (${this}
+   SRCS ${srcs}
+   )