diff --git a/biogeochem/EDPhysiologyMod.F90 b/biogeochem/EDPhysiologyMod.F90
index 9706c1af0d..971eb48e9e 100644
--- a/biogeochem/EDPhysiologyMod.F90
+++ b/biogeochem/EDPhysiologyMod.F90
@@ -1231,16 +1231,16 @@ subroutine SeedDecay( litt )
 
     ! default value from Liscke and Loffler 2006 ; making this a PFT-specific parameter
     ! decays the seed pool according to exponential model
-    ! seed_decay_turnover is in yr-1
+    ! seed_decay_rate is in yr-1
     ! seed_decay is kg/day
     ! Assume that decay rates are same for all chemical species
 
     do pft = 1,numpft 
        litt%seed_decay(pft) = litt%seed(pft) * &
-             EDPftvarcon_inst%seed_decay_turnover(pft)*years_per_day
+             EDPftvarcon_inst%seed_decay_rate(pft)*years_per_day
 
        litt%seed_germ_decay(pft) = litt%seed_germ(pft) * &
-             EDPftvarcon_inst%seed_decay_turnover(pft)*years_per_day
+             EDPftvarcon_inst%seed_decay_rate(pft)*years_per_day
 
     enddo
 
@@ -1274,14 +1274,14 @@ subroutine SeedGermination( litt, cold_stat, drought_stat )
 
     !----------------------------------------------------------------------
 
-    ! germination_timescale is being pulled to PFT parameter; units are 1/yr
+    ! germination_rate is being pulled to PFT parameter; units are 1/yr
     ! thus the mortality rate of seed -> recruit (in units of carbon) 
-    ! is seed_decay_turnover(p)/germination_timescale(p)
+    ! is seed_decay_rate(p)/germination_rate(p)
     ! and thus the mortality rate (in units of individuals) is the product of 
     ! that times the ratio of (hypothetical) seed mass to recruit biomass
 
     do pft = 1,numpft
-       litt%seed_germ_in(pft) =  min(litt%seed(pft) * EDPftvarcon_inst%germination_timescale(pft), &
+       litt%seed_germ_in(pft) =  min(litt%seed(pft) * EDPftvarcon_inst%germination_rate(pft), &
                                      max_germination)*years_per_day
        
        !set the germination only under the growing season...c.xu
diff --git a/main/EDParamsMod.F90 b/main/EDParamsMod.F90
index 34365e1150..986151a8fe 100644
--- a/main/EDParamsMod.F90
+++ b/main/EDParamsMod.F90
@@ -1,9 +1,11 @@
 module EDParamsMod
+
    !
    ! module that deals with reading the ED parameter file
    !
 
    use FatesConstantsMod, only : r8 => fates_r8
+   use FatesConstantsMod, only : nearzero
    use FatesParametersInterface, only : param_string_length
    use FatesGlobals        , only : fates_log
    use FatesGlobals        , only : endrun => fates_endrun
@@ -42,6 +44,13 @@ module EDParamsMod
    real(r8),protected, public :: ED_val_patch_fusion_tol
    real(r8),protected, public :: ED_val_canopy_closure_thresh ! site-level canopy closure point where trees take on forest (narrow) versus savannah (wide) crown allometry
 
+   
+   logical,protected, public :: active_crown_fire        ! flag, 1=active crown fire 0=no active crown fire
+   character(len=param_string_length),parameter :: fates_name_active_crown_fire = "fates_fire_active_crown_fire"
+   
+   real(r8), protected, public :: cg_strikes             ! fraction of cloud to ground lightning strikes (0-1)
+   character(len=param_string_length),parameter :: fates_name_cg_strikes="fates_fire_cg_strikes"
+   
    real(r8),protected,public  :: q10_mr     ! Q10 for respiration rate (for soil fragmenation and plant respiration)    (unitless)
    real(r8),protected,public  :: q10_froz   ! Q10 for frozen-soil respiration rates (for soil fragmentation)            (unitless)
 
@@ -50,6 +59,7 @@ module EDParamsMod
    real(r8),protected,allocatable,public :: ED_val_history_ageclass_bin_edges(:)
    real(r8),protected,allocatable,public :: ED_val_history_height_bin_edges(:)
 
+   
    character(len=param_string_length),parameter,public :: ED_name_mort_disturb_frac = "fates_mort_disturb_frac"
    character(len=param_string_length),parameter,public :: ED_name_comp_excln = "fates_comp_excln"
    character(len=param_string_length),parameter,public :: ED_name_init_litter = "fates_init_litter"
@@ -69,10 +79,13 @@ module EDParamsMod
    character(len=param_string_length),parameter,public :: ED_name_phen_mindayson= "fates_phen_mindayson"   
    character(len=param_string_length),parameter,public :: ED_name_phen_ncolddayslim= "fates_phen_ncolddayslim"   
    character(len=param_string_length),parameter,public :: ED_name_phen_coldtemp= "fates_phen_coldtemp"   
-   character(len=param_string_length),parameter,public :: ED_name_cohort_fusion_tol= "fates_cohort_fusion_tol"   
+   character(len=param_string_length),parameter,public :: ED_name_cohort_fusion_tol= "fates_cohort_size_fusion_tol"   
    character(len=param_string_length),parameter,public :: ED_name_patch_fusion_tol= "fates_patch_fusion_tol"
    character(len=param_string_length),parameter,public :: ED_name_canopy_closure_thresh= "fates_canopy_closure_thresh"      
 
+   ! Resistance to active crown fire
+  
+
    character(len=param_string_length),parameter :: fates_name_q10_mr="fates_q10_mr"
    character(len=param_string_length),parameter :: fates_name_q10_froz="fates_q10_froz"
 
@@ -170,7 +183,6 @@ subroutine FatesParamsInit()
     ED_val_cohort_fusion_tol              = nan
     ED_val_patch_fusion_tol               = nan
     ED_val_canopy_closure_thresh          = nan    
-    
     hydr_kmax_rsurf1                      = nan
     hydr_kmax_rsurf2                      = nan
 
@@ -333,6 +345,12 @@ subroutine FatesRegisterParams(fates_params)
     call fates_params%RegisterParameter(name=ED_name_history_height_bin_edges, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names_height)
 
+    call fates_params%RegisterParameter(name=fates_name_active_crown_fire, dimension_shape=dimension_shape_scalar, &
+         dimension_names=dim_names_scalar)
+
+    call fates_params%RegisterParameter(name=fates_name_cg_strikes, dimension_shape=dimension_shape_scalar, &
+         dimension_names=dim_names_scalar)
+
   end subroutine FatesRegisterParams
 
   
@@ -345,6 +363,9 @@ subroutine FatesReceiveParams(fates_params)
 
     class(fates_parameters_type), intent(inout) :: fates_params
 
+    real(r8) :: active_crown_fire_real !Local temp to transfer real data in file
+
+
     call fates_params%RetreiveParameter(name=ED_name_mort_disturb_frac, &
           data=fates_mortality_disturbance_fraction)
 
@@ -456,6 +477,13 @@ subroutine FatesReceiveParams(fates_params)
     call fates_params%RetreiveParameter(name=fates_name_q10_froz, &
           data=q10_froz)
 
+    call fates_params%RetreiveParameter(name=fates_name_active_crown_fire, &
+          data=active_crown_fire_real)
+    active_crown_fire = (abs(active_crown_fire_real-1.0_r8)<nearzero)
+
+    call fates_params%RetreiveParameter(name=fates_name_cg_strikes, &
+          data=cg_strikes)
+
     ! parameters that are arrays of size defined within the params file and thus need allocating as well
     call fates_params%RetreiveParameterAllocate(name=ED_name_history_sizeclass_bin_edges, &
           data=ED_val_history_sizeclass_bin_edges)
@@ -465,7 +493,7 @@ subroutine FatesReceiveParams(fates_params)
 
     call fates_params%RetreiveParameterAllocate(name=ED_name_history_height_bin_edges, &
           data=ED_val_history_height_bin_edges)
-
+    
 
   end subroutine FatesReceiveParams
   
@@ -517,6 +545,8 @@ subroutine FatesReportParams(is_master)
         write(fates_log(),fmt0) 'logging_dbhmax_infra = ',logging_dbhmax_infra
         write(fates_log(),fmt0) 'q10_mr = ',q10_mr
         write(fates_log(),fmt0) 'q10_froz = ',q10_froz
+        write(fates_log(),fmt0) 'cg_strikes = ',cg_strikes
+        write(fates_log(),'(a,L)') 'active_crown_fire = ',active_crown_fire
         write(fates_log(),*) '------------------------------------------------------'
 
      end if
diff --git a/main/EDPftvarcon.F90 b/main/EDPftvarcon.F90
index 0e4a9f7720..7a2fe0ef3a 100644
--- a/main/EDPftvarcon.F90
+++ b/main/EDPftvarcon.F90
@@ -108,8 +108,9 @@ module EDPftvarcon
      real(r8), allocatable :: vcmaxse(:)
      real(r8), allocatable :: jmaxse(:)
      real(r8), allocatable :: tpuse(:)
-     real(r8), allocatable :: germination_timescale(:)
-     real(r8), allocatable :: seed_decay_turnover(:)
+     real(r8), allocatable :: germination_rate(:)        ! Fraction of seed mass germinating per year (yr-1)
+     real(r8), allocatable :: seed_decay_rate(:)         ! Fraction of seed mass (both germinated and 
+                                                         ! ungerminated), decaying per year    (yr-1)
      
      real(r8), allocatable :: trim_limit(:)              ! Limit to reductions in leaf area w stress (m2/m2)
      real(r8), allocatable :: trim_inc(:)                ! Incremental change in trimming function   (m2/m2)
@@ -198,11 +199,57 @@ module EDPftvarcon
      real(r8), allocatable :: prt_phos_stoich_p2(:,:)   ! Parameter 2 for phosphorus stoichiometry (pft x organ) 
      real(r8), allocatable :: prt_alloc_priority(:,:)   ! Allocation priority for each organ (pft x organ) [integer 0-6]
 
+     ! Nutrient Aquisition parameters
+
+     real(r8), allocatable :: prescribed_nuptake(:)     ! Nitrogen uptake flux per unit crown area 
+                                                        ! (negative implies fraction of NPP) kgN/m2/yr
+
+     real(r8), allocatable :: prescribed_puptake(:)     ! Phosphorus uptake flux per unit crown area 
+                                                        ! (negative implies fraction of NPP) kgP/m2/yr
+
+     ! (NONE OF THESE ARE ACTIVE YET - PLACEHOLDERS ONLY!!!!!)
+
+     ! Nutrient Aquisition (ECA & RD)
+!     real(r8), allocatable :: decompmicc(:)             ! microbial decomposer biomass gC/m3
+                                                        ! on root surface
+
+     ! ECA Parameters: See Zhu et al. Multiple soil nutrient competition between plants,
+     !                     microbes, and mineral surfaces: model development, parameterization,
+     !                     and example applications in several tropical forests.  Biogeosciences,
+     !                     13, pp.341-363, 2016.
+     ! KM: Michaeles-Menten half-saturation constants for ECA (plant–enzyme affinity)
+     ! VMAX: Product of the reaction-rate and enzyme abundance for each PFT in ECA
+     ! Note*: units of [gC] is grams carbon of fine-root
+
+     real(r8), allocatable :: eca_km_nh4(:)       ! half-saturation constant for plant nh4 uptake  [gN/m3]
+     real(r8), allocatable :: eca_vmax_nh4(:)     ! maximum production rate for plant nh4 uptake   [gN/gC/s] 
+     real(r8), allocatable :: eca_km_no3(:)       ! half-saturation constant for plant no3 uptake  [gN/m3]
+     real(r8), allocatable :: eca_vmax_no3(:)     ! maximum production rate for plant no3 uptake   [gN/gC/s]
+     real(r8), allocatable :: eca_km_p(:)         ! half-saturation constant for plant p uptake    [gP/m3]
+     real(r8), allocatable :: eca_vmax_p(:)       ! maximum production rate for plant p uptake     [gP/gC/s]
+     real(r8), allocatable :: eca_km_ptase(:)     ! half-saturation constant for biochemical P production [gP/m3]
+     real(r8), allocatable :: eca_vmax_ptase(:)   ! maximum production rate for biochemical P prod        [gP/m2/s]
+     real(r8), allocatable :: eca_alpha_ptase(:)  ! Fraction of min P generated from ptase activity
+                                                  ! that is immediately sent to the plant [/]
+     real(r8), allocatable :: eca_lambda_ptase(:) ! critical value for Ptase that incurs 
+                                                  ! biochemical production, fraction based how much
+                                                  ! more in need a plant is for P versus N [/]
+
+     
+     real(r8), allocatable :: nfix1(:)   ! nitrogen fixation parameter 1 (in file, but not used yet)
+     real(r8), allocatable :: nfix2(:)   ! nitrogen fixation parameter 2 (in file, but not used yet)
+
+
      ! Turnover related things
 
      real(r8), allocatable :: phenflush_fraction(:)       ! Maximum fraction of storage carbon used to flush leaves
                                                           ! on bud-burst [kgC/kgC]
 
+     real(r8), allocatable :: phen_cold_size_threshold(:) ! stem/leaf drop occurs on DBH size of decidious non-woody 
+                                                          ! (coastal grass) plants larger than the threshold value 							  
+     real(r8), allocatable :: phen_stem_drop_fraction(:)  ! Fraction of stem dropped/senescened for decidious 
+                                                          ! non-woody (grass) plants		
+
      real(r8), allocatable :: senleaf_long_fdrought(:)    ! Multiplication factor for leaf longevity of senescent 
                                                           ! leaves during drought( 1.0 indicates no change)
 
@@ -718,11 +765,11 @@ subroutine Register_PFT(this, fates_params)
     call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names, lower_bounds=dim_lower_bound)
 
-    name = 'fates_seed_germination_timescale'
+    name = 'fates_seed_germination_rate'
     call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names, lower_bounds=dim_lower_bound)
 
-    name = 'fates_seed_decay_turnover'
+    name = 'fates_seed_decay_rate'
     call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
          dimension_names=dim_names, lower_bounds=dim_lower_bound)
 
@@ -758,7 +805,76 @@ subroutine Register_PFT(this, fates_params)
     call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
           dimension_names=dim_names, lower_bounds=dim_lower_bound)
 
+    name = 'fates_phen_cold_size_threshold'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_phen_stem_drop_fraction'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+
+    ! Nutrient competition parameters
+
+!    name = 'fates_eca_decompmicc'
+!    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+!          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+
+    name = 'fates_eca_km_nh4'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_vmax_nh4'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_km_no3'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_vmax_no3'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
     
+    name = 'fates_eca_km_p'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_vmax_p'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_km_ptase'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_vmax_ptase'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_alpha_ptase'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_eca_lambda_ptase'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+
+    name = 'fates_nfix1'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+         dimension_names=dim_names, lower_bounds=dim_lower_bound)
+
+    name = 'fates_nfix2'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+         dimension_names=dim_names, lower_bounds=dim_lower_bound)
+    
+    name = 'fates_prescribed_nuptake'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)
+
+    name = 'fates_prescribed_puptake'
+    call fates_params%RegisterParameter(name=name, dimension_shape=dimension_shape_1d, &
+          dimension_names=dim_names, lower_bounds=dim_lower_bound)    
+  
   end subroutine Register_PFT
 
   !-----------------------------------------------------------------------
@@ -1149,13 +1265,13 @@ subroutine Receive_PFT(this, fates_params)
     call fates_params%RetreiveParameterAllocate(name=name, &
          data=this%tpuse)
 
-    name = 'fates_seed_germination_timescale'
+    name = 'fates_seed_germination_rate'
     call fates_params%RetreiveParameterAllocate(name=name, &
-         data=this%germination_timescale)
+         data=this%germination_rate)
 
-    name = 'fates_seed_decay_turnover'
+    name = 'fates_seed_decay_rate'
     call fates_params%RetreiveParameterAllocate(name=name, &
-         data=this%seed_decay_turnover)
+         data=this%seed_decay_rate)
 
     name = 'fates_branch_turnover'
     call fates_params%RetreiveParameterAllocate(name=name, &
@@ -1189,6 +1305,75 @@ subroutine Receive_PFT(this, fates_params)
     call fates_params%RetreiveParameterAllocate(name=name, &
          data=this%phenflush_fraction)
 
+    name = 'fates_phen_cold_size_threshold'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+          data=this%phen_cold_size_threshold)
+    
+    name = 'fates_phen_stem_drop_fraction'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+          data=this%phen_stem_drop_fraction)
+
+!    name = 'fates_eca_decompmicc'
+!    call fates_params%RetreiveParameterAllocate(name=name, &
+!         data=this%eca_decompmicc)
+
+    name = 'fates_eca_km_nh4'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_km_nh4)
+
+    name = 'fates_eca_vmax_nh4'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_vmax_nh4)
+
+    name = 'fates_eca_km_no3'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_km_no3)
+
+    name = 'fates_eca_vmax_no3'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_vmax_no3)
+
+    name = 'fates_eca_km_p'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_km_p)
+
+    name = 'fates_eca_vmax_p'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_vmax_p)
+
+    name = 'fates_eca_km_ptase'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_km_ptase)
+
+    name = 'fates_eca_vmax_ptase'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_vmax_ptase)
+
+    name = 'fates_eca_alpha_ptase'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_alpha_ptase)
+
+    name = 'fates_eca_lambda_ptase'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%eca_lambda_ptase)
+
+    name = 'fates_nfix1'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%nfix1)
+
+    name = 'fates_nfix2'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%nfix2)
+
+    name = 'fates_prescribed_nuptake'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%prescribed_nuptake)
+    
+    name = 'fates_prescribed_puptake'
+    call fates_params%RetreiveParameterAllocate(name=name, &
+         data=this%prescribed_puptake)
+    
+    
   end subroutine Receive_PFT
 
   !-----------------------------------------------------------------------
@@ -1767,8 +1952,8 @@ subroutine FatesReportPFTParams(is_master)
         write(fates_log(),fmt0) 'vcmaxse = ',EDPftvarcon_inst%vcmaxse
         write(fates_log(),fmt0) 'jmaxse = ',EDPftvarcon_inst%jmaxse
         write(fates_log(),fmt0) 'tpuse = ',EDPftvarcon_inst%tpuse
-        write(fates_log(),fmt0) 'germination_timescale = ',EDPftvarcon_inst%germination_timescale
-        write(fates_log(),fmt0) 'seed_decay_turnover = ',EDPftvarcon_inst%seed_decay_turnover
+        write(fates_log(),fmt0) 'germination_rate = ',EDPftvarcon_inst%germination_rate
+        write(fates_log(),fmt0) 'seed_decay_rate = ',EDPftvarcon_inst%seed_decay_rate
         write(fates_log(),fmt0) 'branch_turnover = ',EDPftvarcon_inst%branch_turnover
         write(fates_log(),fmt0) 'trim_limit = ',EDPftvarcon_inst%trim_limit
         write(fates_log(),fmt0) 'trim_inc = ',EDPftvarcon_inst%trim_inc
@@ -1777,6 +1962,8 @@ subroutine FatesReportPFTParams(is_master)
         write(fates_log(),fmt0) 'taul = ',EDPftvarcon_inst%taul 
         write(fates_log(),fmt0) 'taus = ',EDPftvarcon_inst%taus
         write(fates_log(),fmt0) 'phenflush_fraction',EDpftvarcon_inst%phenflush_fraction
+        write(fates_log(),fmt0) 'phen_cold_size_threshold = ',EDPftvarcon_inst%phen_cold_size_threshold
+        write(fates_log(),fmt0) 'phen_stem_drop_fraction',EDpftvarcon_inst%phen_stem_drop_fraction
         write(fates_log(),fmt0) 'rootprof_beta = ',EDPftvarcon_inst%rootprof_beta
         write(fates_log(),fmt0) 'fire_alpha_SH = ',EDPftvarcon_inst%fire_alpha_SH
         write(fates_log(),fmt0) 'allom_hmode = ',EDPftvarcon_inst%allom_hmode
@@ -1994,6 +2181,17 @@ subroutine FatesCheckParams(is_master, parteh_mode)
               write(fates_log(),*) ' Aborting'
               call endrun(msg=errMsg(sourcefile, __LINE__))
            end if
+           if ( ( EDPftvarcon_inst%phen_stem_drop_fraction(ipft) < 0.0_r8 ) .or. &
+                ( EDPFtvarcon_inst%phen_stem_drop_fraction(ipft) > 1 ) ) then
+
+              write(fates_log(),*) ' Deciduous non-wood plants must keep 0-100% of their stems'
+              write(fates_log(),*) ' during the dedicous period.'
+              write(fates_log(),*) ' PFT#: ',ipft
+              write(fates_log(),*) ' evergreen flag: (shold be 0):',int(EDPftvarcon_inst%evergreen(ipft))
+              write(fates_log(),*) ' phen_stem_drop_fraction: ', EDPFtvarcon_inst%phen_stem_drop_fraction(ipft)
+              write(fates_log(),*) ' Aborting'
+              call endrun(msg=errMsg(sourcefile, __LINE__))
+           end if	
         end if
 
  
diff --git a/parameter_files/fates_params_default.cdl b/parameter_files/fates_params_default.cdl
index 82142bf816..3573dd4feb 100644
--- a/parameter_files/fates_params_default.cdl
+++ b/parameter_files/fates_params_default.cdl
@@ -4,6 +4,7 @@ dimensions:
 	fates_history_age_bins = 7 ;
 	fates_history_height_bins = 6 ;
 	fates_history_size_bins = 13 ;
+	fates_history_coage_bins = 1 ;
 	fates_hydr_organs = 4 ;
 	fates_leafage_class = 1 ;
 	fates_litterclass = 6 ;
@@ -15,6 +16,9 @@ variables:
 	double fates_history_ageclass_bin_edges(fates_history_age_bins) ;
 		fates_history_ageclass_bin_edges:units = "yr" ;
 		fates_history_ageclass_bin_edges:long_name = "Lower edges for age class bins used in age-resolved patch history output" ;
+	double fates_history_coageclass_bin_edges(fates_history_coage_bins) ;
+		fates_history_coageclass_bin_edges:units = "years" ;
+		fates_history_coageclass_bin_edges:long_name = "Lower edges for cohort age class bins used in cohort age resolved history output" ;
 	double fates_history_height_bin_edges(fates_history_height_bins) ;
 		fates_history_height_bin_edges:units = "m" ;
 		fates_history_height_bin_edges:long_name = "Lower edges for height bins used in height-resolved history output" ;
@@ -112,7 +116,7 @@ variables:
 		fates_allom_stmode:units = "index" ;
 		fates_allom_stmode:long_name = "storage allometry function index" ;
 	double fates_branch_turnover(fates_pft) ;
-		fates_branch_turnover:units = "yr-1" ;
+		fates_branch_turnover:units = "yr" ;
 		fates_branch_turnover:long_name = "turnover time of branches" ;
 	double fates_c2b(fates_pft) ;
 		fates_c2b:units = "ratio" ;
@@ -120,6 +124,39 @@ variables:
 	double fates_displar(fates_pft) ;
 		fates_displar:units = "unitless" ;
 		fates_displar:long_name = "Ratio of displacement height to canopy top height" ;
+	double fates_eca_alpha_ptase(fates_pft) ;
+		fates_eca_alpha_ptase:units = "g/m3" ;
+		fates_eca_alpha_ptase:long_name = "fraction of P from ptase activity sent directly to plant (ECA)" ;
+	double fates_eca_decompmicc(fates_pft) ;
+		fates_eca_decompmicc:units = "gC/m3" ;
+		fates_eca_decompmicc:long_name = "mean soil microbial decomposer biomass (ECA)" ;
+	double fates_eca_km_nh4(fates_pft) ;
+		fates_eca_km_nh4:units = "gN/m3" ;
+		fates_eca_km_nh4:long_name = "half-saturation constant for plant nh4 uptake (ECA)" ;
+	double fates_eca_km_no3(fates_pft) ;
+		fates_eca_km_no3:units = "gN/m3" ;
+		fates_eca_km_no3:long_name = "half-saturation constant for plant no3 uptake (ECA)" ;
+	double fates_eca_km_p(fates_pft) ;
+		fates_eca_km_p:units = "gP/m3" ;
+		fates_eca_km_p:long_name = "half-saturation constant for plant p uptake (ECA)" ;
+	double fates_eca_km_ptase(fates_pft) ;
+		fates_eca_km_ptase:units = "gP/m3" ;
+		fates_eca_km_ptase:long_name = "half-saturation constant for biochemical P (ECA)" ;
+	double fates_eca_lambda_ptase(fates_pft) ;
+		fates_eca_lambda_ptase:units = "g/m3" ;
+		fates_eca_lambda_ptase:long_name = "critical value for biochemical production (ECA)" ;
+	double fates_eca_vmax_nh4(fates_pft) ;
+		fates_eca_vmax_nh4:units = "gN/gC/s" ;
+		fates_eca_vmax_nh4:long_name = "maximum production rate for plant nh4 uptake (ECA)" ;
+	double fates_eca_vmax_no3(fates_pft) ;
+		fates_eca_vmax_no3:units = "gN/gC/s" ;
+		fates_eca_vmax_no3:long_name = "maximum production rate for plant no3 uptake (ECA)" ;
+	double fates_eca_vmax_p(fates_pft) ;
+		fates_eca_vmax_p:units = "gP/gC/s" ;
+		fates_eca_vmax_p:long_name = "maximum production rate for plant p uptake (ECA)" ;
+	double fates_eca_vmax_ptase(fates_pft) ;
+		fates_eca_vmax_ptase:units = "gP/m2/s" ;
+		fates_eca_vmax_ptase:long_name = "maximum production rate for biochemical P (per m2) (ECA)" ;
 	double fates_fire_alpha_SH(fates_pft) ;
 		fates_fire_alpha_SH:units = "NA" ;
 		fates_fire_alpha_SH:long_name = "spitfire parameter, alpha scorch height, Equation 16 Thonicke et al 2010" ;
@@ -273,6 +310,18 @@ variables:
 	double fates_mort_hf_sm_threshold(fates_pft) ;
 		fates_mort_hf_sm_threshold:units = "unitless" ;
 		fates_mort_hf_sm_threshold:long_name = "soil moisture (btran units) at which drought mortality begins for non-hydraulic model" ;
+	double fates_mort_ip_age_senescence(fates_pft) ;
+		fates_mort_ip_age_senescence:units = "years" ;
+		fates_mort_ip_age_senescence:long_name = "Mortality cohort age senescence inflection point" ;
+	double fates_mort_ip_size_senescence(fates_pft) ;
+		fates_mort_ip_size_senescence:units = "dbh cm" ;
+		fates_mort_ip_size_senescence:long_name = "Mortality dbh senescence inflection point" ;
+	double fates_mort_r_age_senescence(fates_pft) ;
+		fates_mort_r_age_senescence:units = "mortality rate year^-1" ;
+		fates_mort_r_age_senescence:long_name = "Mortality age senescence rate of change" ;
+	double fates_mort_r_size_senescence(fates_pft) ;
+		fates_mort_r_size_senescence:units = "mortality rate dbh^-1" ;
+		fates_mort_r_size_senescence:long_name = "Mortality dbh senescence rate of change" ;
 	double fates_mort_scalar_coldstress(fates_pft) ;
 		fates_mort_scalar_coldstress:units = "1/yr" ;
 		fates_mort_scalar_coldstress:long_name = "maximum mortality rate from cold stress" ;
@@ -282,12 +331,24 @@ variables:
 	double fates_mort_scalar_hydrfailure(fates_pft) ;
 		fates_mort_scalar_hydrfailure:units = "1/yr" ;
 		fates_mort_scalar_hydrfailure:long_name = "maximum mortality rate from hydraulic failure" ;
+	double fates_nfix1(fates_pft) ;
+		fates_nfix1:units = "NA" ;
+		fates_nfix1:long_name = "place-holder for future n-fixation parameter (NOT IMPLEMENTED)" ;
+	double fates_nfix2(fates_pft) ;
+		fates_nfix2:units = "NA" ;
+		fates_nfix2:long_name = "place-holder for future n-fixation parameter (NOT IMPLEMENTED)" ;
+	double fates_phen_cold_size_threshold(fates_pft) ;
+		fates_phen_cold_size_threshold:units = "cm" ;
+		fates_phen_cold_size_threshold:long_name = "the dbh size above which will lead to phenology-related stem and leaf drop" ;
 	double fates_phen_evergreen(fates_pft) ;
 		fates_phen_evergreen:units = "logical flag" ;
 		fates_phen_evergreen:long_name = "Binary flag for evergreen leaf habit" ;
 	double fates_phen_season_decid(fates_pft) ;
 		fates_phen_season_decid:units = "logical flag" ;
 		fates_phen_season_decid:long_name = "Binary flag for seasonal-deciduous leaf habit" ;
+	double fates_phen_stem_drop_fraction(fates_pft) ;
+		fates_phen_stem_drop_fraction:units = "fraction" ;
+		fates_phen_stem_drop_fraction:long_name = "fraction of stems to drop for non-woody species during drought/cold" ;
 	double fates_phen_stress_decid(fates_pft) ;
 		fates_phen_stress_decid:units = "logical flag" ;
 		fates_phen_stress_decid:long_name = "Binary flag for stress-deciduous leaf habit" ;
@@ -306,6 +367,12 @@ variables:
 	double fates_prescribed_npp_understory(fates_pft) ;
 		fates_prescribed_npp_understory:units = "kgC / m^2 / yr" ;
 		fates_prescribed_npp_understory:long_name = "NPP per unit crown area of understory trees for prescribed physiology mode" ;
+	double fates_prescribed_nuptake(fates_pft) ;
+		fates_prescribed_nuptake:units = "kgN/m^2/yr" ;
+		fates_prescribed_nuptake:long_name = "Nitrogen uptake flux per unit crown area (negative implies fraction of NPP)" ;
+	double fates_prescribed_puptake(fates_pft) ;
+		fates_prescribed_puptake:units = "kgP/m^2/yr" ;
+		fates_prescribed_puptake:long_name = "Phosphorus uptake flux per unit crown area (negative implies fraction of NPP)" ;
 	double fates_prescribed_recruitment(fates_pft) ;
 		fates_prescribed_recruitment:units = "n/yr" ;
 		fates_prescribed_recruitment:long_name = "recruitment rate for prescribed physiology mode" ;
@@ -363,12 +430,12 @@ variables:
 	double fates_seed_dbh_repro_threshold(fates_pft) ;
 		fates_seed_dbh_repro_threshold:units = "cm" ;
 		fates_seed_dbh_repro_threshold:long_name = "the diameter (if any) where the plant will start extra clonal allocation to the seed pool" ;
-	double fates_seed_decay_turnover(fates_pft) ;
-		fates_seed_decay_turnover:units = "1/yr" ;
-		fates_seed_decay_turnover:long_name = "turnover time for seeds with respect to germination" ;
-	double fates_seed_germination_timescale(fates_pft) ;
-		fates_seed_germination_timescale:units = "1/yr" ;
-		fates_seed_germination_timescale:long_name = "turnover time for seeds with respect to decay" ;
+	double fates_seed_decay_rate(fates_pft) ;
+		fates_seed_decay_rate:units = "yr-1" ;
+		fates_seed_decay_rate:long_name = "fraction of seeds that decay per year" ;
+	double fates_seed_germination_rate(fates_pft) ;
+		fates_seed_germination_rate:units = "yr-1" ;
+		fates_seed_germination_rate:long_name = "fraction of seeds that germinate per year" ;
 	double fates_seed_suppl(fates_pft) ;
 		fates_seed_suppl:units = "KgC/m2/yr" ;
 		fates_seed_suppl:long_name = "Supplemental external seed rain source term (non-mass conserving)" ;
@@ -462,9 +529,12 @@ variables:
 	double fates_canopy_closure_thresh ;
 		fates_canopy_closure_thresh:units = "unitless" ;
 		fates_canopy_closure_thresh:long_name = "tree canopy coverage at which crown area allometry changes from savanna to forest value" ;
-	double fates_cohort_fusion_tol ;
-		fates_cohort_fusion_tol:units = "unitless" ;
-		fates_cohort_fusion_tol:long_name = "minimum fraction in difference in dbh between cohorts" ;
+	double fates_cohort_age_fusion_tol ;
+		fates_cohort_age_fusion_tol:units = "unitless" ;
+		fates_cohort_age_fusion_tol:long_name = "minimum fraction in differece in cohort age between cohorts. 0 or _ implies functionality is turned off." ;
+	double fates_cohort_size_fusion_tol ;
+		fates_cohort_size_fusion_tol:units = "unitless" ;
+		fates_cohort_size_fusion_tol:long_name = "minimum fraction in difference in dbh between cohorts" ;
 	double fates_comp_excln ;
 		fates_comp_excln:units = "none" ;
 		fates_comp_excln:long_name = "weighting factor (exponent on dbh) for canopy layer exclusion and promotion" ;
@@ -474,6 +544,12 @@ variables:
 	double fates_cwd_flig ;
 		fates_cwd_flig:units = "unitless" ;
 		fates_cwd_flig:long_name = "Lignin fraction of coarse woody debris" ;
+	double fates_fire_active_crown_fire ;
+		fates_fire_active_crown_fire:units = "0 or 1" ;
+		fates_fire_active_crown_fire:long_name = "flag, 1=active crown fire 0=no active crown fire" ;
+	double fates_fire_cg_strikes ;
+		fates_fire_cg_strikes:units = "fraction (0-1)" ;
+		fates_fire_cg_strikes:long_name = "fraction of cloud to ground lightning strikes" ;
 	double fates_fire_drying_ratio ;
 		fates_fire_drying_ratio:units = "NA" ;
 		fates_fire_drying_ratio:long_name = "spitfire parameter, fire drying ratio for fuel moisture, alpha_FMC EQ 6 Thonicke et al 2010" ;
@@ -593,11 +669,16 @@ variables:
 		fates_soil_salinity:long_name = "soil salinity used for model when not coupled to dynamic soil salinity" ;
 
 // global attributes:
-		:history = "This parameter file is maintained in version control\nSee https://github.com/NGEET/fates/blob/master/parameter_files/fates_params_default.cdl \nFor changes, use git blame \n" ;
+		:history = "This parameter file is maintained in version control\n",
+			"See https://github.com/NGEET/fates/blob/master/parameter_files/fates_params_default.cdl \n",
+			"For changes, use git blame \n",
+			"" ;
 data:
 
  fates_history_ageclass_bin_edges = 0, 1, 2, 5, 10, 20, 50 ;
 
+ fates_history_coageclass_bin_edges = _ ;
+
  fates_history_height_bin_edges = 0, 0.1, 0.3, 1, 3, 10 ;
 
  fates_history_sizeclass_bin_edges = 0, 5, 10, 15, 20, 30, 40, 50, 60, 70, 
@@ -706,6 +787,28 @@ data:
  fates_displar = 0.67, 0.67, 0.67, 0.67, 0.67, 0.67, 0.67, 0.67, 0.67, 0.67, 
     0.67, 0.67 ;
 
+ fates_eca_alpha_ptase = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_decompmicc = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_km_nh4 = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_km_no3 = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_km_p = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_km_ptase = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_lambda_ptase = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_vmax_nh4 = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_vmax_no3 = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_vmax_p = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_eca_vmax_ptase = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
  fates_fire_alpha_SH = 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 0.2, 
     0.2 ;
 
@@ -890,6 +993,14 @@ data:
  fates_mort_hf_sm_threshold = 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 
     1e-06, 1e-06, 1e-06, 1e-06, 1e-06, 1e-06 ;
 
+ fates_mort_ip_age_senescence = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_mort_ip_size_senescence = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_mort_r_age_senescence = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_mort_r_size_senescence = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
  fates_mort_scalar_coldstress = 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3 ;
 
  fates_mort_scalar_cstarvation = 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 
@@ -898,10 +1009,18 @@ data:
  fates_mort_scalar_hydrfailure = 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 0.6, 
     0.6, 0.6, 0.6 ;
 
+ fates_nfix1 = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_nfix2 = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_phen_cold_size_threshold = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ;
+
  fates_phen_evergreen = 1, 1, 0, 1, 0, 0, 1, 0, 0, 0, 0, 0 ;
 
  fates_phen_season_decid = 0, 0, 1, 0, 0, 1, 0, 0, 1, 1, 0, 0 ;
 
+ fates_phen_stem_drop_fraction = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ;
+
  fates_phen_stress_decid = 0, 0, 0, 0, 1, 0, 0, 1, 0, 0, 1, 1 ;
 
  fates_phenflush_fraction = _, _, 0.5, _, 0.5, 0.5, _, 0.5, 0.5, 0.5, 0.5, 0.5 ;
@@ -918,6 +1037,10 @@ data:
  fates_prescribed_npp_understory = 0.03125, 0.03125, 0.03125, 0.03125, 
     0.03125, 0.03125, 0.03125, 0.03125, 0.03125, 0.03125, 0.03125, 0.03125 ;
 
+ fates_prescribed_nuptake = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
+ fates_prescribed_puptake = _, _, _, _, _, _, _, _, _, _, _, _ ;
+
  fates_prescribed_recruitment = 0.02, 0.02, 0.02, 0.02, 0.02, 0.02, 0.02, 
     0.02, 0.02, 0.02, 0.02, 0.02 ;
 
@@ -950,12 +1073,17 @@ data:
   _, _, _, _, _, _, _, _, _, _, _, _ ;
 
  fates_prt_phos_stoich_p1 =
-  _, _, _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _, _, _,
-  _, _, _, _, _, _, _, _, _, _, _, _ ;
+  0.0033, 0.0029, 0.004, 0.0033, 0.004, 0.004, 0.0033, 0.004, 0.004, 0.004, 
+    0.004, 0.004,
+  0.0024, 0.0024, 0.0024, 0.0024, 0.0024, 0.0024, 0.0024, 0.0024, 0.0024, 
+    0.0024, 0.0024, 0.0024,
+  1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 
+    1e-09, 1e-09,
+  1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 1e-09, 
+    1e-09, 1e-09,
+  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+  0.00047, 0.00047, 0.00047, 0.00047, 0.00047, 0.00047, 0.00047, 0.00047, 
+    0.00047, 0.00047, 0.00047, 0.00047 ;
 
  fates_prt_phos_stoich_p2 =
   _, _, _, _, _, _, _, _, _, _, _, _,
@@ -1000,11 +1128,11 @@ data:
  fates_seed_dbh_repro_threshold = 150, 90, 90, 90, 90, 90, 3, 3, 2, 1.47, 
     1.47, 1.47 ;
 
- fates_seed_decay_turnover = 0.51, 0.51, 0.51, 0.51, 0.51, 0.51, 0.51, 0.51, 
+ fates_seed_decay_rate = 0.51, 0.51, 0.51, 0.51, 0.51, 0.51, 0.51, 0.51, 
     0.51, 0.51, 0.51, 0.51 ;
 
- fates_seed_germination_timescale = 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 
-    0.5, 0.5, 0.5, 0.5 ;
+ fates_seed_germination_rate = 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 0.5, 
+    0.5, 0.5, 0.5 ;
 
  fates_seed_suppl = 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ;
 
@@ -1096,7 +1224,9 @@ data:
 
  fates_canopy_closure_thresh = 0.8 ;
 
- fates_cohort_fusion_tol = 0.08 ;
+ fates_cohort_age_fusion_tol = _ ;
+
+ fates_cohort_size_fusion_tol = 0.08 ;
 
  fates_comp_excln = 3 ;
 
@@ -1104,6 +1234,10 @@ data:
 
  fates_cwd_flig = 0.24 ;
 
+ fates_fire_active_crown_fire = 0 ;
+
+ fates_fire_cg_strikes = 0.2 ;
+
  fates_fire_drying_ratio = 66000 ;
 
  fates_fire_durat_slope = -11.06 ;
diff --git a/tools/ncvarsort.py b/tools/ncvarsort.py
index 8bacdf0132..3f0f3a3a47 100755
--- a/tools/ncvarsort.py
+++ b/tools/ncvarsort.py
@@ -35,18 +35,19 @@ def main():
     # sort the variables by dimensionality, but mix the PFT x other dimension in with the regular PFT-indexed variables
     dimtype_sortorder_dict = {
     (u'fates_history_age_bins',):0,
-    (u'fates_history_height_bins',):1,
-    (u'fates_history_size_bins',):2,
-    (u'fates_pft', u'fates_string_length'):3,
-    (u'fates_prt_organs', u'fates_string_length'):4,
-    (u'fates_pft',):5,
-    (u'fates_variants', u'fates_pft'):5,
-    (u'fates_hydr_organs', u'fates_pft'):5,
-    (u'fates_leafage_class', u'fates_pft'):5,
-    (u'fates_prt_organs', u'fates_pft'):5,
-    (u'fates_litterclass',):6,
-    (u'fates_NCWD',):7,
-    ():8}
+    (u'fates_history_coage_bins',):1,
+    (u'fates_history_height_bins',):2,
+    (u'fates_history_size_bins',):3,
+    (u'fates_pft', u'fates_string_length'):4,
+    (u'fates_prt_organs', u'fates_string_length'):5,
+    (u'fates_pft',):6,
+    (u'fates_variants', u'fates_pft'):6,
+    (u'fates_hydr_organs', u'fates_pft'):6,
+    (u'fates_leafage_class', u'fates_pft'):6,
+    (u'fates_prt_organs', u'fates_pft'):6,
+    (u'fates_litterclass',):7,
+    (u'fates_NCWD',):8,
+    ():9}
     #
     # go through each of the variables and assign it to one of the sub-lists based on its dimensionality
     for v_name, varin in dsin.variables.iteritems():