diff --git a/.gitmodules b/.gitmodules
index 94610494..f35d1e2e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -19,8 +19,8 @@
         fxDONOTUSEurl = https://github.com/MPAS-Dev/MPAS-Model.git
 [submodule "ncar-physics"]
         path          = src/physics/ncar_ccpp
-	url           = https://github.com/ESCOMP/atmospheric_physics
-	fxtag         = e95c172d7a5a0ebf054f420b08416228e211baa3
+	url           = https://github.com/jimmielin/atmospheric_physics
+	fxtag         = 996a6d5
         fxrequired    = AlwaysRequired
         fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
 [submodule "ccs_config"]
diff --git a/src/control/cam_comp.F90 b/src/control/cam_comp.F90
index 538bd641..7667b584 100644
--- a/src/control/cam_comp.F90
+++ b/src/control/cam_comp.F90
@@ -29,6 +29,7 @@ module cam_comp
    use physics_types,             only: phys_state, phys_tend
    use physics_types,             only: dtime_phys
    use physics_types,             only: calday
+   use physics_types,             only: is_first_timestep
    use dyn_comp,                  only: dyn_import_t, dyn_export_t
 
    use perf_mod,                  only: t_barrierf, t_startf, t_stopf
@@ -151,6 +152,9 @@ subroutine cam_init(caseid, ctitle, model_doi_url,                         &
       dtime_phys = 0.0_r8
       call mark_as_initialized('timestep_for_physics')
 
+      is_first_timestep = is_first_step()
+      call mark_as_initialized('is_first_timestep')
+
       call init_pio_subsystem()
 
       ! Initializations using data passed from coupler.
@@ -263,6 +267,9 @@ subroutine cam_timestep_init()
       use phys_comp, only: phys_timestep_init
       use stepon,    only: stepon_timestep_init
 
+      ! Update timestep flags in physics state
+      is_first_timestep = is_first_step()
+
       !----------------------------------------------------------
       ! First phase of dynamics (at least couple from dynamics to physics)
       ! Return time-step for physics from dynamics.
diff --git a/src/data/registry.xml b/src/data/registry.xml
index 5ae88e03..e55e8a4c 100644
--- a/src/data/registry.xml
+++ b/src/data/registry.xml
@@ -251,6 +251,12 @@
       <dimensions>horizontal_dimension</dimensions>
       <ic_file_input_names>tw_cur state_tw_cur</ic_file_input_names>
     </variable>
+    <!-- Timestep properties -->
+    <variable local_name="is_first_timestep"
+              standard_name="is_first_timestep"
+              units="flag" type="logical" access="protected">
+      <long_name>flag indicating if is first timestep of initial run</long_name>
+    </variable>
     <!-- State tendencies -->
     <variable local_name="dTdt_total"
               standard_name="tendency_of_air_temperature_due_to_model_physics"
diff --git a/src/dynamics/se/dp_coupling.F90 b/src/dynamics/se/dp_coupling.F90
index 64efb9b2..ea251163 100644
--- a/src/dynamics/se/dp_coupling.F90
+++ b/src/dynamics/se/dp_coupling.F90
@@ -592,11 +592,12 @@ subroutine derived_phys_dry(cam_runtime_opts, phys_state, phys_tend)
    use geopotential_temp, only: geopotential_temp_run
    use static_energy,     only: update_dry_static_energy_run
    use qneg,              only: qneg_run
-!   use check_energy,   only: check_energy_timestep_init
+!   use check_energy_chng,   only: check_energy_chng_timestep_init
    use hycoef,            only: hyai, ps0
    use shr_vmath_mod,     only: shr_vmath_log
    use shr_kind_mod,      only: shr_kind_cx
    use dyn_comp,          only: ixo, ixo2, ixh, ixh2
+   use dyn_tests_utils,   only: vc_dry_pressure
 
    ! arguments
    type(runtime_options), intent(in)    :: cam_runtime_opts ! Runtime settings object
@@ -855,7 +856,7 @@ subroutine derived_phys_dry(cam_runtime_opts, phys_state, phys_tend)
 !Remove once check_energy scheme exists in CAMDEN:
 #if 0
       ! Compute energy and water integrals of input state
-      call check_energy_timestep_init(phys_state, phys_tend, pbuf_chnk)
+      ! call check_energy_chng_timestep_init(...)
 #endif
 
 end subroutine derived_phys_dry
diff --git a/src/physics/ncar_ccpp b/src/physics/ncar_ccpp
index e95c172d..996a6d51 160000
--- a/src/physics/ncar_ccpp
+++ b/src/physics/ncar_ccpp
@@ -1 +1 @@
-Subproject commit e95c172d7a5a0ebf054f420b08416228e211baa3
+Subproject commit 996a6d517128496285cd3bcae12aed3be11da622