diff --git a/.gitmodules b/.gitmodules
index 2fe70e7..f5c365c 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,9 +1,9 @@
 [submodule "CMEPS/CMEPS"]
 	path = CMEPS/CMEPS
-	url = https://github.com/ESCOMP/CMEPS
+	url = https://github.com/access-nri/cmeps
 [submodule "CDEPS/CDEPS"]
 	path = CDEPS/CDEPS
-	url = https://github.com/ESCOMP/CDEPS
+	url = https://github.com/access-nri/cdeps
 [submodule "share/CESM_share"]
 	path = share/CESM_share
-	url = https://github.com/ESCOMP/CESM_share.git
+	url = https://github.com/access-nri/cesm_share
diff --git a/CDEPS/CDEPS b/CDEPS/CDEPS
index debc545..8a1b5a4 160000
--- a/CDEPS/CDEPS
+++ b/CDEPS/CDEPS
@@ -1 +1 @@
-Subproject commit debc5453e75195fac8bc418318322a1a63402d16
+Subproject commit 8a1b5a4c26780ea3e07c75740e0a6e3bd1776205
diff --git a/share/CESM_share b/share/CESM_share
index b2fa120..1b15cc8 160000
--- a/share/CESM_share
+++ b/share/CESM_share
@@ -1 +1 @@
-Subproject commit b2fa120301f09323bfd3b7467a9b1fd13cf08ea3
+Subproject commit 1b15cc8542908190ba8caa7df323e035e54fe57d
diff --git a/share/CMakeLists.txt b/share/CMakeLists.txt
index d69c0eb..e19cdf4 100755
--- a/share/CMakeLists.txt
+++ b/share/CMakeLists.txt
@@ -27,6 +27,7 @@ target_sources(share PRIVATE
   CESM_share/src/nuopc_shr_methods.F90
   CESM_share/src/shr_abort_mod.F90
   CESM_share/src/shr_cal_mod.F90
+  CESM_share/src/shr_const_mod.F90
   CESM_share/src/shr_file_mod.F90
   CESM_share/src/shr_kind_mod.F90
   CESM_share/src/shr_log_mod.F90
@@ -44,11 +45,11 @@ target_sources(share PRIVATE
   CESM_share/src/shr_timer_mod.F90
   CESM_share/src/shr_wv_sat_mod.F90
   CESM_share/src/water_isotopes/water_isotopes.F90
+  CESM_share/src/water_isotopes/shr_wtracers_mod.F90
 
   # The following file is a stub.
-  stubs/mct_mod.F90
+  CESM_share/src/stubs/access3/mct_mod.F90
 )
-add_patched_source(share CESM_share/src/shr_const_mod.F90)
 
 if(CMAKE_Fortran_COMPILER_ID MATCHES "Intel")
   # CESM reduces the precision and increases speed for the following file
@@ -129,3 +130,4 @@ install(EXPORT Access3Sharetiming_Targets
   NAMESPACE Access3::
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/Access3Share
 )
+
diff --git a/share/patches/shr_const_mod.F90.patch b/share/patches/shr_const_mod.F90.patch
deleted file mode 100644
index 6d5d57a..0000000
--- a/share/patches/shr_const_mod.F90.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/src/shr_const_mod.F90 b/src/shr_const_mod.F90
-index 8437190..bd4b687 100644
---- a/src/shr_const_mod.F90
-+++ b/src/shr_const_mod.F90
-@@ -17,7 +17,7 @@ MODULE shr_const_mod
-    real(R8),parameter :: SHR_CONST_CDAY    = 86400.0_R8      ! sec in calendar day ~ sec
-    real(R8),parameter :: SHR_CONST_SDAY    = 86164.0_R8      ! sec in siderial day ~ sec
-    real(R8),parameter :: SHR_CONST_OMEGA   = 2.0_R8*SHR_CONST_PI/SHR_CONST_SDAY ! earth rot ~ rad/sec
--   real(R8),parameter :: SHR_CONST_REARTH  = 6.37122e6_R8    ! radius of earth ~ m
-+   real(R8),parameter :: SHR_CONST_REARTH  = 6.371229e6_R8   ! radius of earth used by UM13 ~ m
-    real(R8),parameter :: SHR_CONST_G       = 9.80616_R8      ! acceleration of gravity ~ m/s^2
- 
-    real(R8),parameter :: SHR_CONST_STEBOL  = 5.67e-8_R8      ! Stefan-Boltzmann constant ~ W/m^2/K^4
-@@ -87,7 +87,6 @@ contains
- !-----------------------------------------------------------------------------
- 
-   elemental logical function shr_const_isspval(rval)
--!$omp declare simd(shr_const_isspval)
- 
-      real(r8), intent(in) :: rval
- 
diff --git a/share/stubs/mct_mod.F90 b/share/stubs/mct_mod.F90
deleted file mode 100644
index 4591721..0000000
--- a/share/stubs/mct_mod.F90
+++ /dev/null
@@ -1,13 +0,0 @@
-module m_MCTWorld
-  implicit none
-
-contains
-
-  subroutine init(ncomps, globalcomm, mycomms, myids)
-    integer, intent(in) :: ncomps
-    integer, intent(in) :: globalcomm
-    integer, dimension(:), pointer :: mycomms
-    integer, dimension(:), pointer :: myids
-  end subroutine init
-
-end module m_MCTWorld