diff --git a/config/default.cfg b/config/default.cfg
index e24659b3c..9ba498588 100644
--- a/config/default.cfg
+++ b/config/default.cfg
@@ -1225,11 +1225,11 @@ cfg$gms$s35_secdf_distribution <- 2             # def = 2
 
 # Damages in natural forests
 # * (0): No damage simulated
-# * (1): Damage from shifting agriculture (constant)
-# * (2): Damage from shifting agriculture is faded out by the year defined in 'cfg$gms$c35_forest_damage_end'
+# * (1): Damage from shifting cultivation (constant)
+# * (2): Damage from shifting cultivation is faded out by the year defined in 'cfg$gms$s35_forest_damage_end'
 # * (4): Generic forest disturbance scenarios defined in `f35_forest_shock.csv`
 cfg$gms$s35_forest_damage <- 2                  # def = 2
-# * If option (2) above: Year by which damage from shifting agriculture has petered out
+# * If option (2) above: Year by which damage from shifting cultivation has petered out
 cfg$gms$s35_forest_damage_end <- 2050 #def = 2050
 
 # Harvesting switch for timber production
diff --git a/modules/35_natveg/input/files b/modules/35_natveg/input/files
index 7774904be..4378d4244 100644
--- a/modules/35_natveg/input/files
+++ b/modules/35_natveg/input/files
@@ -1,6 +1,5 @@
 * list of files that are required here
 npi_ndc_ad_aolc_pol.cs3
-f35_forest_disturbance_share.cs4
 f35_forest_lost_share.cs3
 f35_forest_shock.csv
 pot_forest_area.cs2
diff --git a/modules/35_natveg/pot_forest_may24/input.gms b/modules/35_natveg/pot_forest_may24/input.gms
index e551fbd3d..94ae85a9d 100644
--- a/modules/35_natveg/pot_forest_may24/input.gms
+++ b/modules/35_natveg/pot_forest_may24/input.gms
@@ -28,12 +28,12 @@ s35_timber_harvest_cost_other        Cost for harvesting from other land (USD17M
 s35_timber_harvest_cost_primforest   Cost for harvesting from primary forest (USD17MER per ha) / 3690 /
 s35_natveg_harvest_shr Constrains the allowed wood harvest from natural vegetation (1=unconstrained) (1) /1/
 s35_secdf_distribution Flag for secdf initialization (0=all secondary forest in highest age class 1=Equal distribution among all age classes 2=Poulter distribution from MODIS satellite data) (1) / 2 /
-s35_forest_damage Damage simulation in forests (0=none 1=shifting agriculture 2= Damage from shifting agriculture is faded out by c35_forest_damage_end 4= f35_forest_shock scenario) / 2 /
+s35_forest_damage Damage simulation in forests (0=none 1=shifting cultivation 2=shifting cultivation faded out by s35_forest_damage_end 4= f35_forest_shock scenario) / 2 /
 s35_forest_damage_end   Year of forest damage end  (1)              / 2050 /
 s35_npi_ndc_reversal    Year in which NPI NDC reversal should take place (1) / Inf /
 ;
 
-table f35_forest_lost_share(i,driver_source) Share of area damaged by forest fires (1)
+table f35_forest_lost_share(i,driver_source) Share of forest area disturbed per year by driver (1)
 $ondelim
 $include "./modules/35_natveg/input/f35_forest_lost_share.cs3"
 $offdelim
@@ -51,13 +51,6 @@ $include "./modules/35_natveg/input/f35_forest_shock.csv"
 $offdelim
 ;
 
-parameter f35_forest_disturbance_share(i) Share of area damaged by forest disturbances (1)
-/
-$ondelim
-$include "./modules/35_natveg/input/f35_forest_disturbance_share.cs4"
-$offdelim
-/;
-
 parameter f35_pot_forest_area(t_all,j) Potential forest area (mio. ha)
 /
 $ondelim
diff --git a/modules/35_natveg/pot_forest_may24/presolve.gms b/modules/35_natveg/pot_forest_may24/presolve.gms
index 952223a74..1069e1b60 100644
--- a/modules/35_natveg/pot_forest_may24/presolve.gms
+++ b/modules/35_natveg/pot_forest_may24/presolve.gms
@@ -6,24 +6,19 @@
 *** |  Contact: magpie@pik-potsdam.de
 
 * ----------------------------------------------------
-* Shift ageclasses due to shifting agriculture fires
+* Shift ageclasses due to forest disturbance
 * ----------------------------------------------------
 
 * first calculate damages
 if(s35_forest_damage=1,
-  p35_disturbance_loss_secdf(t,j,ac_sub) = pc35_secdforest(j,ac_sub) * sum(cell(i,j),f35_forest_lost_share(i,"shifting_agriculture"))*m_timestep_length_forestry;
-  p35_disturbance_loss_primf(t,j) = pcm_land(j,"primforest") * sum(cell(i,j),f35_forest_lost_share(i,"shifting_agriculture"))*m_timestep_length_forestry;
+  p35_disturbance_loss_secdf(t,j,ac_sub) = pc35_secdforest(j,ac_sub) * sum(cell(i,j),f35_forest_lost_share(i,"shifting_cultivation"))*m_timestep_length_forestry;
+  p35_disturbance_loss_primf(t,j) = pcm_land(j,"primforest") * sum(cell(i,j),f35_forest_lost_share(i,"shifting_cultivation"))*m_timestep_length_forestry;
   );
 
 * shifting cultivation is faded out
 if(s35_forest_damage=2,
-  p35_disturbance_loss_secdf(t,j,ac_sub) = pc35_secdforest(j,ac_sub) * sum(cell(i,j),f35_forest_lost_share(i,"shifting_agriculture"))*m_timestep_length_forestry*(1 - p35_damage_fader(t));
-  p35_disturbance_loss_primf(t,j) = pcm_land(j,"primforest") * sum(cell(i,j),f35_forest_lost_share(i,"shifting_agriculture"))*m_timestep_length_forestry*(1 - p35_damage_fader(t));
-  );
-
-if(s35_forest_damage=3,
-  p35_disturbance_loss_secdf(t,j,ac_sub) = pc35_secdforest(j,ac_sub) * sum((cell(i,j),combined_loss),f35_forest_lost_share(i,combined_loss))*m_timestep_length_forestry;
-  p35_disturbance_loss_primf(t,j) = pcm_land(j,"primforest") * sum((cell(i,j),combined_loss),f35_forest_lost_share(i,combined_loss))*m_timestep_length_forestry;
+  p35_disturbance_loss_secdf(t,j,ac_sub) = pc35_secdforest(j,ac_sub) * sum(cell(i,j),f35_forest_lost_share(i,"shifting_cultivation"))*m_timestep_length_forestry*(1 - p35_damage_fader(t));
+  p35_disturbance_loss_primf(t,j) = pcm_land(j,"primforest") * sum(cell(i,j),f35_forest_lost_share(i,"shifting_cultivation"))*m_timestep_length_forestry*(1 - p35_damage_fader(t));
   );
 
 * generic disturbance scenarios
diff --git a/modules/35_natveg/pot_forest_may24/sets.gms b/modules/35_natveg/pot_forest_may24/sets.gms
index ad7b29f0f..5e22de3a5 100644
--- a/modules/35_natveg/pot_forest_may24/sets.gms
+++ b/modules/35_natveg/pot_forest_may24/sets.gms
@@ -7,12 +7,9 @@
 
 sets
 
-  driver_source Source of deforestation drivers
-  / overall, deforestation, shifting_agriculture,
-  forestry, wildfire, urbanization /
-
-  combined_loss(driver_source) Combined loss from fire plus agriculture
-  / shifting_agriculture,wildfire /
+* Columns of f35_forest_lost_share, as produced by mrland's calcForestLossByDriver
+  driver_source Source of forest disturbance
+  / shifting_cultivation /
 
   pol35 Land protection policy
   / none, npi, ndc /