diff --git a/biogeochem/EDPatchDynamicsMod.F90 b/biogeochem/EDPatchDynamicsMod.F90
index 1f6501aa44..83bc6d3bfc 100644
--- a/biogeochem/EDPatchDynamicsMod.F90
+++ b/biogeochem/EDPatchDynamicsMod.F90
@@ -1958,7 +1958,7 @@ subroutine zero_patch(cp_p)
 
 
     ! FIRE
-    currentPatch%litter_moisture(:)         = 0.0_r8 ! litter moisture
+   currentPatch%litter_moisture(:)         = 0.0_r8 ! litter moisture
     currentPatch%fuel_eff_moist             = 0.0_r8 ! average fuel moisture content of the ground fuel 
     ! (incl. live grasses. omits 1000hr fuels)
     currentPatch%livegrass                  = 0.0_r8 ! total ag grass biomass in patch. 1=c3 grass, 2=c4 grass. gc/m2
diff --git a/parameter_files/fates_params_default.cdl b/parameter_files/fates_params_default.cdl
index 82142bf816..ce0f796afa 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 = - ;
 	fates_hydr_organs = 4 ;
 	fates_leafage_class = 1 ;
 	fates_litterclass = 6 ;
@@ -21,6 +22,9 @@ variables:
 	double fates_history_sizeclass_bin_edges(fates_history_size_bins) ;
 		fates_history_sizeclass_bin_edges:units = "cm" ;
 		fates_history_sizeclass_bin_edges:long_name = "Lower edges for DBH size class bins used in size-resolved cohort 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" ;	
 	char fates_pftname(fates_pft, fates_string_length) ;
 		fates_pftname:units = "unitless - string" ;
 		fates_pftname:long_name = "Description of plant type" ;
@@ -264,6 +268,18 @@ variables:
 	double fates_mort_bmort(fates_pft) ;
 		fates_mort_bmort:units = "1/yr" ;
 		fates_mort_bmort:long_name = "background mortality rate" ;
+	double fates_mort_ip_senescence(fates_pft);
+                fates_mort_ip_senescence:units = "dbh cm";
+                fates_mort_ip_senescence:long_name ="Mortality dbh senescence inflection point";
+        double fates_mort_r_senescence(fates_pft);
+                fates_mort_r_senescence:units = "mortality rate dbh^-1";
+                fates_mort_r_senescence:long_name = "Mortality dbh senescence rate of change";
+	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_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_freezetol(fates_pft) ;
 		fates_mort_freezetol:units = "NA" ;
 		fates_mort_freezetol:long_name = "minimum temperature tolerance (NOT USED)" ;
@@ -465,6 +481,9 @@ variables:
 	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" ;	
 	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" ;
@@ -603,6 +622,8 @@ data:
  fates_history_sizeclass_bin_edges = 0, 5, 10, 15, 20, 30, 40, 50, 60, 70, 
     80, 90, 100 ;
 
+fates_history_coageclass_bin_edges = - ;
+
  fates_pftname =
   "broadleaf_evergreen_tropical_tree          ",
   "needleleaf_evergreen_extratrop_tree        ",
@@ -881,6 +902,14 @@ data:
  fates_mort_bmort = 0.014, 0.014, 0.014, 0.014, 0.014, 0.014, 0.014, 0.014, 
     0.014, 0.014, 0.014, 0.014 ;
 
+ fates_mort_ip_senescence = -, -, -, -, -, -, -, -, -, -, -, - ;
+
+ fates_mort_r_senescence = -, -, -, -, -, -, -, -, -, -, -, - ;
+
+ fates_mort_ip_age_senescence = -, -, -, -, -, -, -, -, -, -, -, - ;
+
+ fates_mort_r_age_senescence = -, -, -, -, -, -, -, -, -, -, -, - ;
+
  fates_mort_freezetol = 2.5, -55, -80, -30, 2.5, -30, -60, -10, -80, -80, 
     -20, 2.5 ;
 
@@ -1098,6 +1127,8 @@ data:
 
  fates_cohort_fusion_tol = 0.08 ;
 
+ fates_cohort_age_fusion_tol = - ;
+
  fates_comp_excln = 3 ;
 
  fates_cwd_fcel = 0.76 ;
diff --git a/tools/FatesPFTIndexSwapper.py b/tools/FatesPFTIndexSwapper.py
index 091ffc30ce..b31c8fffb8 100755
--- a/tools/FatesPFTIndexSwapper.py
+++ b/tools/FatesPFTIndexSwapper.py
@@ -15,7 +15,7 @@
 import code  # For development: code.interact(local=locals())
 from datetime import datetime
 from scipy.io import netcdf
-import matplotlib.pyplot as plt
+#import matplotlib.pyplot as plt
 
 # =======================================================================================
 # Parameters