diff --git a/CHANGELOG.md b/CHANGELOG.md
index bbd2bdd14e..1d7b181f9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 ## [Unreleased]
 
 ### changed
+- **41_area_equipped_for_irrigation** updated (non-default) AEI data (from Mehta2022 to Mehta2024)
 - **22_land_conservation and default.cfg** Added options for baseline protection
 - **15_food, default.cfg and scenario_config.csv** changed fader setup and introduced new switches for specifying food substitution scenarios and exogeneous food intake scenarios
 - **70_livestock** default.cfg and scenario_config.csv** changed fader setup and introduced new switches for specifying feed substitution with SCP scenarios
diff --git a/config/default.cfg b/config/default.cfg
index 693b579897..ee4fee540a 100644
--- a/config/default.cfg
+++ b/config/default.cfg
@@ -1087,7 +1087,8 @@ cfg$gms$area_equipped_for_irrigation <- "endo_apr13"    # def = endo_apr13
 
 # * switch for initialization area
 # * (LUH2v2): area equipped for irrigation based on LUH2v2 irrigated areas
-# * (Mehta2022): area equipped for irrigation from Mehta et al. (2022)
+# * (Mehta2024_Siebert2013): area equipped for irrigation from Mehta et al. (2024) using GMIA (Siebert et al, 2013) base map
+# * (Mehta2024_Meier2018): are equipped for irrigation from Mehta et al. (2024) using Meier et al. (2018) base map
 cfg$gms$c41_initial_irrigation_area  <- "LUH2v2"        # def = LUH2v2
 
 # * Sets the rate of depreciation of irrigation infrastructure in every timestep.
diff --git a/config/scenario_config.csv b/config/scenario_config.csv
old mode 100644
new mode 100755
index fd673c0b0e..131070f9a1
--- a/config/scenario_config.csv
+++ b/config/scenario_config.csv
@@ -1,47 +1,56 @@
-;cc;nocc;nocc_hist;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SDP;SDP-EI;SDP-RC;SDP-MC;BASE;NPI;NDC;coupling;emulator;input;Tland;eat_lancet_diet;EL2_Diet;EL2_default;EL2_lessSus;LAMA_Inequal;LAMA_Inequal-SustDemand;LAMA_Inequal-EnvirProt;LAMA_Inequal-GHGPrice;LAMA_Sustainability;NAVIGATE_AllOff;NAVIGATE_LandSup;NAVIGATE_LandDem;NAVIGATE_AllOn;ForestryEndo;ForestryExo;ForestryOff;frst_shock_none;frst_shock_002lin2030;frst_shock_004lin2030;frst_shock_008lin2030;frst_shock_016lin2030;rcp1p9;rcp2p6;rcp4p5;rcp6p0;rcp7p0;rcp8p5;NGFS_o_lowdem;GENIE_SCP
+;cc;nocc;nocc_hist;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SDP;SDP-EI;SDP-RC;SDP-MC;BASE;NPI;NDC;coupling;emulator;input;Tland;eat_lancet_diet;EL2_PHD;EL2_Demand;EL2_default;LAMA_Inequal;LAMA_Inequal-SustDemand;LAMA_Inequal-EnvirProt;LAMA_Inequal-GHGPrice;LAMA_Sustainability;NAVIGATE_AllOff;NAVIGATE_LandSup;NAVIGATE_LandDem;NAVIGATE_AllOn;ForestryEndo;ForestryExo;ForestryOff;frst_shock_none;frst_shock_002lin2030;frst_shock_004lin2030;frst_shock_008lin2030;frst_shock_016lin2030;rcp1p9;rcp2p6;rcp4p5;rcp6p0;rcp7p0;rcp8p5;NGFS_o_lowdem;GENIE_SCP
+gms$c_timesteps;;;;;;;;;;;;;;;;;less_TS;less_TS;;;;;;;5year;5year;5year;5year;5year;;;;;;;;;;;;;;;;;;;;coup2110
 gms$c09_pop_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SSP1;SSP1;SSP1;;;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;
 gms$c09_gdp_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SDP_EI;SDP_RC;SDP_MC;;;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;
-gms$c09_pal_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SSP2;SSP1;SSP1;;;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;
+gms$c09_pal_scenario;;;;SSP1;SSP2;SSP2EU;SSP3;SSP4;SSP5;SSP1;SSP2;SSP1;SSP1;;;;;;;;;SDP;SDP;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;;
 gms$s12_interest_lic;;;;;;;;;;;;;;;;;;;;;;0.06;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s12_interest_hic;;;;;;;;;;;;;;;;;;;;;;0.04;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c13_tccost;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;high
+gms$c14_yields_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;nocc
+gms$food;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;anthropometrics_jan18
 gms$c15_food_scenario;;;;SSP1;SSP2;SSP2;SSP3;SSP4;SSP5;SSP1;SSP2;SSP1;SSP1;;;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;SSP2;
 gms$c15_food_scenario_noselect;;;;;;;;;;;;;;;;;;;;;;;;;SSP4;SSP1;SSP4;SSP4;SSP1;;;;;;;;;;;;;;;;;;;SSP2;
-gms$s15_elastic_demand;;;;0;0;0;0;0;0;0;0;0;0;;;;;;;0;0;0;;;0;0;0;0;0;;;;;;;;;;;;;;;;;;;;
+gms$s15_elastic_demand;;;;0;0;0;0;0;0;0;0;0;0;;;;;;;0;0;0;0;;0;0;0;0;0;;;;;;;;;;;;;;;;;;;;
 gms$s15_rumdairy_scp_substitution;;;;0;0;0;0;0;0;0;0.5;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s15_food_subst_functional_form;;;;;;;;;;;2;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s15_food_substitution_start;;;;;;;;;;;2020;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s15_food_substitution_target;;;;;;;;;;;2050;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$kfo_rd;;;;;;;;;;;livst_rum;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;livst_rum,livst_milk
-gms$s15_exo_foodscen_convergence;;;;;;;;;;1;1;1;1;;;;;;;1;1;1;;;;1;;;1;;;;;;;;;;;;;;;;;;;1;
-gms$s15_exo_foodscen_functional_form;;;;;;;;;;1;1;1;1;;;;;;;1;1;1;;;;1;;;1;;;;;;;;;;;;;;;;;;;1;
-gms$s15_exo_foodscen_start;;;;;;;;;;2020;2020;2020;2020;;;;;;;2020;2020;2020;;;;2020;;;2020;;;;;;;;;;;;;;;;;;;2020;
-gms$s15_exo_foodscen_target;;;;;;;;;;2050;2050;2050;2070;;;;;;;2050;2050;2050;;;;2050;;;2050;;;;;;;;;;;;;;;;;;;2050;
-gms$s15_exo_waste;;;;0;0;0;0;0;0;1;1;1;1;;;;;;;1;0;1;;;0;1;0;0;1;0;0;1;1;;;;;;;;;;;;;;;1;
-gms$s15_waste_scen;;;;;;;;;;1.2;1.3;1.2;1.25;;;;;;;1.2;1.2;1.2;;;;1.2;;;1.2;;;;;;;;;;;;;;;;;;;1.2;
-gms$s15_exo_diet;;;;0;0;0;0;0;0;1;1;1;1;;;;;;;1;1;3;;;0;1;0;0;1;0;0;1;1;;;;;;;;;;;;;;;1;
-gms$c15_kcal_scen;;;;;;;;;;healthy_BMI;no_underweight;healthy_BMI;healthy_BMI;;;;;;;healthy_BMI;healthy_BMI;healthy_BMI;;;;healthy_BMI;;;healthy_BMI;;;;;;;;;;;;;;;;;;;healthy_BMI;
-gms$c15_EAT_scen;;;;;;;;;;FLX;;FLX;FLX;;;;;;;FLX;FLX;FLX;;;;FLX;;;FLX;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_monogastric;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_ruminant;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_fish;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_fruitvegnut;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_roots;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_pulses;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_sugar;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_oils;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_brans;;;;;;;;;;1;0;1;1;;;;;;;1;1;0;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_scp;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_exo_alcohol;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
-gms$s15_alc_scen;0.014;;;;;;;;;;;;;;;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_foodscen_convergence;;;;;;;;;;1;1;1;1;;;;;;;1;1;1;1;;;1;;;1;;;;;;;;;;;;;;;;;;;1;
+gms$s15_exo_foodscen_functional_form;;;;;;;;;;1;1;1;1;;;;;;;1;1;1;1;;;1;;;1;;;;;;;;;;;;;;;;;;;1;
+gms$s15_exo_foodscen_start;;;;;;;;;;2020;2020;2020;2020;;;;;;;2020;2020;2020;2020;;;2020;;;2020;;;;;;;;;;;;;;;;;;;2020;
+gms$s15_exo_foodscen_target;;;;;;;;;;2050;2050;2050;2070;;;;;;;2050;2050;2050;2050;;;2050;;;2050;;;;;;;;;;;;;;;;;;;2050;
+gms$s15_exo_waste;;;;0;0;0;0;0;0;1;1;1;1;;;;;;;1;0;1;1;;0;1;0;0;1;0;0;1;1;;;;;;;;;;;;;;;1;
+gms$s15_waste_scen;;;;;;;;;;1.2;1.3;1.2;1.25;;;;;;;1.2;1.2;1.2;1.2;;;1.2;;;1.2;;;;;;;;;;;;;;;;;;;1.2;
+gms$s15_exo_diet;;;;0;0;0;0;0;0;1;1;1;1;;;;;;;1;1;3;3;;0;1;0;0;1;0;0;1;1;;;;;;;;;;;;;;;1;
+gms$c15_kcal_scen;;;;;;;;;;healthy_BMI;no_underweight;healthy_BMI;healthy_BMI;;;;;;;healthy_BMI;healthy_BMI;healthy_BMI;healthy_BMI;;;healthy_BMI;;;healthy_BMI;;;;;;;;;;;;;;;;;;;healthy_BMI;
+gms$c15_EAT_scen;;;;;;;;;;FLX;;FLX;FLX;;;;;;;FLX;FLX;FLX;FLX;;;FLX;;;FLX;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_monogastric;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_ruminant;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_fish;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_fruitvegnut;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_roots;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_pulses;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_sugar;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_oils;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_brans;;;;;;;;;;1;0;1;1;;;;;;;1;1;0;0;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_scp;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_exo_alcohol;;;;;;;;;;1;0;1;1;;;;;;;1;1;1;1;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
+gms$s15_alc_scen;0.014;;;;;;;;;;;;;;;;;;;;;0;0;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c20_scp_type;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;hydrogen
 gms$c21_trade_liberalization;;;;l908080r807070;l909090r808080;l909090r808080;l909595r809090;l908080r807070;l908080r807070;l908080r807070;l908080r807070;l909595r809090;l908080r807070;;;;;;;;;;;;l908080r807070;l908080r807070;l908080r807070;l908080r807070;l908080r807070;;;;;;;;;;;;;;;;;;;;
 gms$c22_protect_scenario;;;;none;none;none;none;none;none;BH;none;BH_IFL;BH;;;;;;;BH;;;;;BH_IFL;BH_IFL;BH_IFL;BH_IFL;BH_IFL;;;;;;;;;;;;;;;;;;;;
 gms$c22_protect_scenario_noselect;;;;;;;;;;;;;;;;;;;;;;;;;none;none;BH_IFL;none;BH_IFL;;;;;;;;;;;;;;;;;;;;
-gms$c30_bioen_water;;;;rainfed;rainfed;rainfed;rainfed;rainfed;rainfed;rainfed;all;rainfed;rainfed;;;;;;;rainfed;;;rainfed;all;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c30_bioen_water;;;;rainfed;rainfed;rainfed;rainfed;rainfed;rainfed;rainfed;all;rainfed;rainfed;;;;;;;rainfed;;;;rainfed;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s30_snv_shr;;;;0;0;0;0;0;0;0;0;0;0.2;;;;;;;0;;;;;0.2;0.2;0.2;0.2;0.2;;;;;;;;;;;;;;;;;;;;
 gms$s30_snv_shr_noselect;;;;;;;;;;;;;;;;;;;;;;;;;0;0;0.2;0;0.2;;;;;;;;;;;;;;;;;;;;
 gms$s30_snv_scenario_target;;;;;;;;;;;;;2030;;;;;;;;;;;;2030;2030;2030;2030;2030;;;;;;;;;;;;;;;;;;;;
+gms$s30_annual_max_growth;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0.02
 gms$c31_grassl_yld_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$s32_aff_plantation;;;;0;0;0;0;0;0;0;1;0;0;;;;;;;0;;;0;1;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c32_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;;;
+gms$s32_initial_distribution;;;;;;;;;;;;;;;;;;;;;;;;;1;1;1;1;1;;;;;1;1;0;;;;;;;;;;;;;
+gms$s32_hvarea;;;;;;;;;;;;;;;;;;;;;;;;;2;2;2;2;2;;;;;2;1;0;;;;;;;;;;;;;
+gms$s32_aff_plantation;;;;0;0;0;0;0;0;0;1;0;0;;;;;;;0;;;;0;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s32_aff_bii_coeff;;;;0;0;0;0;0;0;0;1;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s32_max_aff_area;;;;Inf;Inf;Inf;Inf;Inf;Inf;500;350;0;700;;;;;;;500;;;;;Inf;Inf;Inf;500;500;;;;;;;;;;;;;;;;;;;;
 gms$c32_aff_mask;;;;noboreal;noboreal;noboreal;noboreal;noboreal;noboreal;onlytropical;onlytropical;onlytropical;onlytropical;;;;;;;onlytropical;;;;;noboreal;noboreal;noboreal;noboreal;noboreal;;;;;;;;;;;;;;;;;;;;
@@ -51,54 +60,45 @@ gms$s32_planing_horizon;;;;50;50;50;50;50;50;50;30;50;50;;;;;;;50;;;;;;;;;;;;;;;
 gms$c35_ad_policy;;;;;;;;;;;;;;none;npi;ndc;;;;;;;;;ndc;ndc;ndc;ndc;ndc;;;;;;;;;;;;;;;;;;;;
 gms$c35_aolc_policy;;;;;;;;;;;;;;none;npi;ndc;;;;;;;;;ndc;ndc;ndc;ndc;ndc;;;;;;;;;;;;;;;;;;;;
 gms$s35_forest_damage_end;;;;2030;2050;2050;2050;2050;2030;2030;2030;2030;2030;;;;;;;2030;;;;;2030;2030;2030;2030;2030;;;;;;;;;;;;;;;;;;;;
+gms$c35_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;;;
+gms$s35_forest_damage;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4;4;4;4;4;;;;;;;;
+gms$s35_secdf_distribution;;;;;;;;;;;;;;;;;;;;;;;;;2;2;2;2;2;;;;;2;2;0;;;;;;;;;;;;;
+gms$s35_hvarea;;;;;;;;;;;;;;;;;;;;;;;;;2;2;2;2;2;;;;;2;2;0;;;;;;;;;;;;;
+gms$factor_costs;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sticky_feb18
+gms$c42_watdem_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
 gms$s42_watdem_nonagr_scenario;;;;1;2;2;3;2;1;1;1;3;1;;;;;;;;;;;;2;1;2;2;1;;;;;;;;;;;;;;;;;;;;
 gms$s42_irrig_eff_scenario;;;;2;2;2;2;2;2;3;3;3;3;;;;;;;3;;;;;3;3;3;3;3;;;;;;;;;;;;;;;;;;;;
 gms$c42_env_flow_policy;;;;on;off;off;off;mixed;on;on;on;on;on;;;;;;;on;;;;;on;on;on;on;on;;;;;;;;;;;;;;;;;;;;
 gms$s42_efp_targetyear;;;;2040;2040;2040;2040;2040;2040;2040;2050;2070;2050;;;;;;;2040;;;;;2040;2040;2040;2040;2040;;;;;;;;;;;;;;;;;;;;
+gms$c43_watavail_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
 gms$s44_target_price;;;;0;0;0;0;0;0;0;0;0;0;;;;;;;0;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$s44_cost_bii_missing;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10000000
 gms$c50_scen_neff;;;;baseeff_add3_add10_add20_max75;baseeff_add3_add5_add10_max65;baseeff_add3_add5_add10_max65;baseeff_add3_add0_add0_max55;baseeff_add3_add10_add15_max75;baseeff_add3_add5_add15_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max65;baseeff_add3_add15_add25_max75;;;;;;;baseeff_add3_add15_add25_max75;;;;;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;;;;;;;;;;;;;;;;;;;;
 gms$c50_scen_neff_noselect;;;;baseeff_add3_add10_add20_max75;baseeff_add3_add5_add10_max65;baseeff_add3_add5_add10_max65;baseeff_add3_add0_add0_max55;baseeff_add3_add10_add15_max75;baseeff_add3_add5_add15_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max75;baseeff_add3_add15_add25_max65;baseeff_add3_add15_add25_max75;;;;;;;baseeff_add3_add15_add25_max75;;;;;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;baseeff_add3_add10_add15_max75;;;;;;;;;;;;;;;;;;;;
+gms$c52_carbon_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
+gms$c52_land_carbon_sink_rcp;;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP45;RCP60;RCPBU;RCPBU;;
 gms$c55_scen_conf;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;ssp1;ssp1;ssp1;ssp1;;;;;;;ssp1;;;;;ssp1;ssp1;ssp1;ssp1;ssp1;;;;;;;;;;;;;;;;;;;;
 gms$c55_scen_conf_noselect;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;ssp1;ssp1;ssp1;ssp1;;;;;;;ssp1;;;;;ssp4;ssp4;ssp1;ssp4;ssp1;;;;;;;;;;;;;;;;;;;;
-gms$c56_pollutant_prices;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;none;none;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
-gms$c56_pollutant_prices_noselect;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;none;none;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
+gms$c56_pollutant_prices;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;;none;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
+gms$c56_pollutant_prices_noselect;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;;none;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-NPi;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
 gms$s56_c_price_exp_aff;;;;50;50;50;50;50;50;50;30;50;50;;;;;;;50;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s56_buffer_aff;;;;0.5;0.5;0.5;0.5;0.5;0.5;0.5;0.5;0.2;0.3;;;;;;;0.5;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$c56_emis_policy;;;;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;redd_nosoil;all_nosoil;;;;;;;reddnatveg_nosoil;;;none;none;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c56_emis_policy;;;;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;reddnatveg_nosoil;redd_nosoil;all_nosoil;;;;;;;reddnatveg_nosoil;;;;none;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$s56_minimum_cprice;;;;;;;;;;;;;;0;0;18;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+gms$c56_mute_ghgprices_until;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;y2020
+gms$c57_macc_version;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;PBL_2022;PBL_2022;PBL_2022;PBL_2022;;;;;;;;;;;;;;;;
+gms$c57_macc_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;Default;Optimistic;Default;Optimistic;;;;;;;;;;;;;;;;
+gms$s58_rewetting_switch;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0;1;0;1;;;;;;;;;;;;;;;;
+gms$c59_som_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
 gms$maccs;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$c60_2ndgen_biodem;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;none;none;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
-gms$c60_2ndgen_biodem_noselect;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;none;none;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
+gms$bioenergy;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1st2ndgen_priced_feb24
+gms$c60_2ndgen_biodem;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;;none;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
+gms$c60_2ndgen_biodem_noselect;;;;;;;;;;;;;;;;;coupling;emulator;coupling;;;;;none;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;R21M42-SDP-PkBudg1000;;;;;;;;;;;;;;;;;;;;R32M46-SSP2EU-NPi
 gms$c60_1stgen_biodem;;;;phaseout2020;const2020;const2020;const2030;const2020;phaseout2020;phaseout2020;phaseout2020;phaseout2020;phaseout2020;;;;;;;phaseout2020;;;;;phaseout2020;phaseout2020;phaseout2020;phaseout2020;phaseout2020;;;;;;;;;;;;;;;;;;;;phaseout2020
 gms$c60_biodem_level;;;;;;;;;;;;;;;;;1;0;;;;;;;1;1;1;1;1;;;;;;;;;;;;;;;;;;;;
 gms$c60_bioenergy_subsidy;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 gms$c60_res_2ndgenBE_dem;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;sdp;ssp2;sdp;sdp;;;;;;;sdp;;;;;ssp4;sdp;ssp4;ssp4;sdp;;;;;;;;;;;;;;;;;;;;
 gms$c70_feed_scen;;;;ssp1;ssp2;ssp2;ssp3;ssp4;ssp5;ssp1;ssp5;ssp1;ssp1;;;;;;;ssp1;;ssp1;;;ssp4;ssp1;ssp4;ssp4;ssp1;;;;;;;;;;;;;;;;;;;;
-gms$c_timesteps;;;;;;;;;;;;;;;;;less_TS;less_TS;;;;;;;5year;5year;5year;5year;5year;;;;;;;;;;;;;;;;;;;;coup2110
-gms$c14_yields_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;nocc
-gms$c42_watdem_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
-gms$c43_watavail_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
-gms$c52_carbon_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
-gms$c59_som_scenario;cc;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;cc;cc;cc;cc;cc;;;;;;;;;;;;;;;;;;;;
-gms$s32_initial_distribution;;;;;;;;;;;;;;;;;;;;;;;;;1;1;1;1;1;;;;;1;1;0;;;;;;;;;;;;;
-gms$s32_hvarea;;;;;;;;;;;;;;;;;;;;;;;;;2;2;2;2;2;;;;;2;1;0;;;;;;;;;;;;;
-gms$s35_secdf_distribution;;;;;;;;;;;;;;;;;;;;;;;;;2;2;2;2;2;;;;;2;2;0;;;;;;;;;;;;;
-gms$s35_hvarea;;;;;;;;;;;;;;;;;;;;;;;;;2;2;2;2;2;;;;;2;2;0;;;;;;;;;;;;;
 gms$s73_timber_demand_switch;;;;;;;;;;;;;;;;;;;;;;;;;1;1;1;1;1;;;;;1;1;0;;;;;;;;;;;;;
-gms$s35_forest_damage;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4;4;4;4;4;;;;;;;;
-gms$c32_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;;;
-gms$c35_shock_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;none;002lin2030;004lin2030;008lin2030;016lin2030;;;;;;;;
 input['cellular'];;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;rev4.106_h12_0bd54110_cellularmagpie_c200_MRI-ESM2-0-ssp119_lpjml-8e6c5eb1.tgz;rev4.106_h12_6819938d_cellularmagpie_c200_MRI-ESM2-0-ssp126_lpjml-8e6c5eb1.tgz;rev4.106_h12_1b5c3817_cellularmagpie_c200_MRI-ESM2-0-ssp245_lpjml-8e6c5eb1.tgz;rev4.106_h12_3c888fa5_cellularmagpie_c200_MRI-ESM2-0-ssp460_lpjml-8e6c5eb1.tgz;rev4.106_h12_fd712c0b_cellularmagpie_c200_MRI-ESM2-0-ssp370_lpjml-8e6c5eb1.tgz;rev4.106_h12_09a63995_cellularmagpie_c200_MRI-ESM2-0-ssp585_lpjml-8e6c5eb1.tgz;;
-gms$c52_land_carbon_sink_rcp;;nocc;nocc_hist;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;RCP19;RCP26;RCP45;RCP60;RCPBU;RCPBU;;
-gms$c57_macc_version;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;PBL_2022;PBL_2022;PBL_2022;PBL_2022;;;;;;;;;;;;;;;;
-gms$c57_macc_scenario;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;Default;Optimistic;Default;Optimistic;;;;;;;;;;;;;;;;
-gms$s58_rewetting_switch;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0;1;0;1;;;;;;;;;;;;;;;;
-magicc_emis_scen;;;;;;;;;;;;;;;;;;;;;;SSP2EU-DSPkB500-DS_betax.mif;SSP2EU-DSPkB500-DS_betax.mif;SSP2EU-DSPkB500-DS_betax.mif;;;;;;;;;;;;;;;;;;;;;;;;;
-gms$c13_tccost;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;high
-gms$food;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;anthropometrics_jan18
-gms$c20_scp_type;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;hydrogen
-gms$s30_annual_max_growth;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;0.02
-gms$s44_cost_bii_missing;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;10000000
-gms$c56_mute_ghgprices_until;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;y2020
-gms$bioenergy;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;1st2ndgen_priced_feb24
-gms$factor_costs;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sticky_feb18
+magicc_emis_scen;;;;;;;;;;;;;;;;;;;;;;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif;REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/literature.bib b/literature.bib
index d4ee7ea751..7f64577c5a 100644
--- a/literature.bib
+++ b/literature.bib
@@ -1023,6 +1023,39 @@ @article{siebert_FAO_2007
   year = {2007},
 }
 
+@article{siebert_FAO_2007,
+  author = {Stefan Siebert and Petra Döll and Sebastian Feick and Jippe Hoogeveen and Karen Frenken},
+  year = {2007},
+  title = {Global Map of Irrigation Areas version 4.0.1.},
+  journal = {Johann Wolfgang Goethe University, Frankfurt am Main, Germany / Food and Agriculture Organization of the United Nations, Rome, Italy.},
+  url = {http://www.fao.org/nr/water/aquastat/irrigationmap/index10.stm},
+}
+
+@article{siebert_FAO_2013,
+  author = {Stefan Siebert, Verena Henrich, Karen Frenken and Jacob Burk},
+  year = {2013},
+  title = {Global Map of Irrigation Areas version 5},
+  journal = {Rheinische Friedrich-Wilhelms-University, Bonn, Germany / Food and Agriculture Organization of the United Nations, Rome, Italy},
+  url = {https://data.apps.fao.org/catalog/iso/f79213a0-88fd-11da-a88f-000d939bc5d8},
+}
+
+@article{meier_global_2018,
+  author = {Meier, Jonas; Zabel, Florian; Mauser, Wolfram},
+  year = {2018},
+  title = {Global Irrigated Areas dataset},
+  journal = {PANGAEA},
+  doi = {https://doi.org/10.1594/PANGAEA.884744},
+  url = {https://doi.pangaea.de/10.1594/PANGAEA.884744},
+}
+
+@article{mehta_half_2024,
+  author = {Mehta, P., Siebert, S., Kummu, M. et al.},
+  year = {2024},
+  title = {Half of twenty-first century global irrigation expansion has been in water-stressed regions},
+  journal = {Nature Water},
+  doi = {https://doi.org/10.1038/s44221-024-00206-9},
+}
+
 @book{fao_aquastat_2016,
   address = {Rome},
   title = {{AQUASTAT} core database},
@@ -1030,7 +1063,7 @@ @book{fao_aquastat_2016
   author = {{FAO}},
   url = {{https://data.harvestportal.org/de/dataset/fao-aquastat/resource/c4668555-eb76-4882-83b1-230038e24f02?inner_span=True}},
   year = {2016},
-  note = {Database accessed on 2023/02/06}
+  note = {Database accessed on 2023/02/06},
 }
 
 @techreport{worldbank_irrigation_1995,
diff --git a/modules/37_labor_prod/exo/sets.gms b/modules/37_labor_prod/exo/sets.gms
index c289793d1a..1a76082620 100644
--- a/modules/37_labor_prod/exo/sets.gms
+++ b/modules/37_labor_prod/exo/sets.gms
@@ -6,7 +6,7 @@
 *** |  Contact: magpie@pik-potsdam.de
 
 sets
- rcp37 climate change impact sceanrios
+ rcp37 climate change impact scenarios
     / rcp119, rcp585 /
 
  metric37 labor productivity impact metric
diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms
index 9208456cb5..f93521ee43 100644
--- a/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms
+++ b/modules/41_area_equipped_for_irrigation/endo_apr13/realization.gms
@@ -7,8 +7,9 @@
 
 
 *' @description This realization allows the model to endogenously decide on investments to deploy additional
-*' irrigation infrastructure, i.e. to increase the area equipped for irrigation (AEI). Initial values for AEI
-*' in 1995 are taken from @siebert_FAO_2007. Contraction of AEI is not possible.
+*' irrigation infrastructure, i.e. to increase the area equipped for irrigation (AEI).
+*' Initial values for AEI are areas that are irrigated in the initial time step in LUH2v2.
+*' Depreciation of AEI can be set via `s41_AEI_depreciation`.
 *' Irrigated crop production can only take place where irrigation infrastructure is present.
 *'
 *' Unit costs per hectare for AEI expansion are derived from a World Bank study (@worldbank_irrigation_1995)
diff --git a/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms b/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms
index 6f0264ed1b..3ffe557c32 100644
--- a/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms
+++ b/modules/41_area_equipped_for_irrigation/endo_apr13/sets.gms
@@ -10,5 +10,5 @@ sets
        / y1995, y2000, y2005, y2010, y2015 /
 
   aei41    Data source for area equipped for irrigation
-       / LUH2v2, Mehta2022 /
+       / LUH2v2, Mehta2024_Siebert2013, Mehta2024_Meier2018 /
 ;
diff --git a/modules/41_area_equipped_for_irrigation/static/realization.gms b/modules/41_area_equipped_for_irrigation/static/realization.gms
index a838b9fc32..5a50115a9c 100644
--- a/modules/41_area_equipped_for_irrigation/static/realization.gms
+++ b/modules/41_area_equipped_for_irrigation/static/realization.gms
@@ -7,7 +7,7 @@
 
 
 *' In this realization, area equipped for irrigation is fixed to input data (around the year 2000)
-*' for all time steps. The source of the input data is @siebert_FAO_2007.
+*' for all time steps. The sources of the input data are @siebert_FAO_2013 and @mehta_half_2024.
 *'
 *' @limitations No irrigation is possible on areas that have not been equipped for irrigation in the past.
 *'
diff --git a/modules/41_area_equipped_for_irrigation/static/sets.gms b/modules/41_area_equipped_for_irrigation/static/sets.gms
index 6f0264ed1b..3ffe557c32 100644
--- a/modules/41_area_equipped_for_irrigation/static/sets.gms
+++ b/modules/41_area_equipped_for_irrigation/static/sets.gms
@@ -10,5 +10,5 @@ sets
        / y1995, y2000, y2005, y2010, y2015 /
 
   aei41    Data source for area equipped for irrigation
-       / LUH2v2, Mehta2022 /
+       / LUH2v2, Mehta2024_Siebert2013, Mehta2024_Meier2018 /
 ;
diff --git a/modules/42_water_demand/agr_sector_aug13/realization.gms b/modules/42_water_demand/agr_sector_aug13/realization.gms
index 4682d1fc6b..06cafc3fbc 100644
--- a/modules/42_water_demand/agr_sector_aug13/realization.gms
+++ b/modules/42_water_demand/agr_sector_aug13/realization.gms
@@ -33,6 +33,7 @@
 *'   efficiency times management factor") from @PIK_report104_2007.
 *'   Here, irrigated area from @siebert_FAO_2007 has been used as aggregation
 *'   weight.
+*'   Contraction of AEI happens if a depreciation rate is set in the switch `s41_AEI_depreciation`. 
 *'
 *' * A regression of country values of the "conveyance efficiency times
 *'   management factor" from @PIK_report104_2007 on GDP.
diff --git a/scripts/output/projects/FSEC_water.R b/scripts/output/projects/FSEC_water.R
index 016ccd2868..564f89ba33 100644
--- a/scripts/output/projects/FSEC_water.R
+++ b/scripts/output/projects/FSEC_water.R
@@ -59,3 +59,7 @@ watStressViolations <- watStress
 # mark violations in different color
 watStressViolations[efvViolation == 1] <- 100
 write.magpie(watStressViolations, file_name = file.path(outputdir, "watStressViolations.mz"))
+
+# Water EFV ratio (EFV to EFR)
+watEFVratio <- waterEFVratio(gdx, level = "grid", dir = outputdir)
+write.magpie(watEFVratio, file_name = file.path(outputdir, "watEFVratio.mz"))
diff --git a/scripts/output/projects/inms_reporting_reg.R b/scripts/output/projects/inms_reporting_reg.R
index bcc2abd4ce..b4cd9aac27 100644
--- a/scripts/output/projects/inms_reporting_reg.R
+++ b/scripts/output/projects/inms_reporting_reg.R
@@ -24,15 +24,15 @@ print("Start inms reporting reg runscript")
 
 if(!exists("source_include")) {
 
-  title       <- "inms_SSP2_RCP4p5_PolicyLow_v4"
-  outputdir       <- "output/inms_SSP2_RCP4p5_PolicyLow_v4_2020-07-13_15.37.07"
+  title     <- "inms_SSP2_RCP4p5_PolicyLow_v4"
+  outputdir <- "output/inms_SSP2_RCP4p5_PolicyLow_v4_2020-07-13_15.37.07"
 
   ###Define arguments that can be read from command line
-  readArgs("outputdir","title")
+  readArgs("outputdir", "title")
 }
 #########################################################################################
 
-print(paste0("script started for output directory",outputdir))
+print(paste0("script started for output directory", outputdir))
 
 withr::local_dir(outputdir)
 
@@ -41,24 +41,26 @@ title <- cfg$title
 print("generating INMS output for the run: ")
 print(title)
 
-filename=paste0("report_",title,".mif")
-gdx=paste0("fulldata.gdx")
-a=getReportINMS(gdx,file=filename,scenario = title,dir=".")
+filename <- paste0("report_", title, ".mif")
+gdx <- paste0("fulldata.gdx")
+a <- getReportINMS(gdx, file = filename, scenario = title, dir = ".")
 
 print(filename)
-mif=read.report(filename)
+mif <- read.report(filename)
 
 
-missingyears=function(x){
-  history=paste0("y",1965+((0:5)*5))
-  x[[1]][[1]] <- time_interpolate(x[[1]][[1]],interpolated_year = c(history,paste0("y",2005+((0:9)*10))),integrate_interpolated_years = TRUE)
-  x[[1]][[1]][,history,] = 0
+missingyears <- function(x) {
+  history <- paste0("y", 1965 + ((0:5) * 5))
+  x[[1]][[1]] <- time_interpolate(x[[1]][[1]],
+                                  interpolated_year = c(history,paste0("y",2005+((0:9)*10))),
+                                  integrate_interpolated_years = TRUE)
+  x[[1]][[1]][, history, ] <- 0
   return(x)
 }
 
 #a=c(missingyears(ssp1),missingyears(ssp2))
-a=missingyears(mif)
+a <- missingyears(mif)
 
-write.reportProject(a,mapping=paste0(wdbefore,"/mapping_inms.csv"),file="report_inms.mif")
+write.reportProject(a, mapping = paste0(wdbefore, "/mapping_inms.csv"), file = "report_inms.mif")
 #write.report(a,file="magpie_results_nov2019.mif")
 warnings()
diff --git a/scripts/start/projects/project_EAT2p0.R b/scripts/start/projects/project_EAT2p0.R
index 901aaa42d3..e941839731 100644
--- a/scripts/start/projects/project_EAT2p0.R
+++ b/scripts/start/projects/project_EAT2p0.R
@@ -33,9 +33,9 @@ cfg$output <- c("output_check",
                 "extra/disaggregation",
                # "projects/FSEC_nitrogenPollution", # do manually on last (high-res) magpie run
                # "projects/FSEC_water", # do manually on last (high-res) magpie run
-                "agmip_report",
                 # add output file: pb_report (magpie (special mif created by getReportPBindicators & remind mif (REMIND_generic_scenName.mif))
-                "rds_report")
+                "rds_report",
+                "projects/agmip_report")
 
 #######################
 # SCENARIO DEFINITION #
@@ -83,15 +83,18 @@ bau <- function(cfg) {
 
   # Climate Change
   cfg$input['cellular'] <- "rev4.99_h12_c6a7458f_cellularmagpie_c200_IPSL-CM6A-LR-ssp370_lpjml-8e6c5eb1.tgz"
-  
+
   return(cfg)
 }
 
 ### Diet component ##
 # Globally achieves EL2 diet by 2050
 diet <- function(cfg) {
+  # Transition towards EL2 food intake recommendations until 2050
   cfg$gms$s15_exo_diet  <- 3
-  
+  # Physical inactivity levels are reduced to 0 from 2020 to 2050
+  cfg$gms$c09_pal_scenario <- "SDP"
+
   return(cfg)
 }
 
@@ -129,9 +132,6 @@ waste <- function(cfg) {
 # where miti is active.
 # Reference: Humpenöder, F., Popp, A., Merfort, L., Luderer, G., Weindl, I., Bodirsky, B., Stevanović, M., Klein, D., Rodrigues, R., Bauer, N., Dietrich, J., Lotze-Campen, H., & Rockström, J. (2023). Data repository - Dietary shifts increase the feasibility of 1.5°C pathways (Version 1) [Data set]. Zenodo. https://doi.org/10.5281/zenodo.8328217
 miti <- function(cfg) {
-  # NDCs
-  cfg <- setScenario(cfg, c("SSP2", "NDC"))
-
   # Mitigation: consistent with 1.5C considering diet change
   cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive/remind/output/C_SSP2EU-DSPkB500-noDS-rem-5/REMIND_generic_C_SSP2EU-DSPkB500-noDS-rem-5.mif"
   cfg$gms$c56_pollutant_prices <- "coupling"
@@ -141,15 +141,6 @@ miti <- function(cfg) {
   return(cfg)
 }
 
-### NoCC component ##
-# No climate change impacts
-noCC <- function(cfg) {
-  # deactivate climate change impacts
-  cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI"))
-
-  return(cfg)
-}
-
 ### RCP 2.6 ###
 # Decomposition Scenario. Apply lower climate impacts based on RCP 2.6 to BAU using GFDL climate model.
 rcp26 <- function(cfg) {
@@ -165,6 +156,9 @@ rcp26 <- function(cfg) {
 # Business as usual scenario based on SSP2
 # with a higher climate impact reflected by RCP 7.0
 cfg$title <- "BAU"
+# standard setting
+cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
@@ -172,6 +166,9 @@ start_run(cfg, codeCheck = FALSE)
 # Decomposition scenario. Adds EL2.0 Diet to BAU:
 # Globally achieves EL2 diet by 2050              # To Do: Check implemention!
 cfg$title <- "BAU_DIET"
+# standard setting
+cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- diet(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
@@ -179,6 +176,9 @@ start_run(cfg, codeCheck = FALSE)
 # BAU_PROD #
 # Decomposition scenario adds high productivity to BAU
 cfg$title <- "BAU_PROD"
+# standard setting
+cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- prod(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
@@ -186,6 +186,9 @@ start_run(cfg, codeCheck = FALSE)
 # BAU_WAST #
 # Decomposition scenario. Adds a reduction (halving) of food loss and waste
 cfg$title <- "BAU_WAST"
+# standard setting
+cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
@@ -193,6 +196,9 @@ start_run(cfg, codeCheck = FALSE)
 # BAU_RCP26 #
 # Decomposition Scenario. Apply lower climate impacts based on RCP 2.6 to BAU
 cfg$title <- "BAU_RCP26"
+# standard setting
+cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- rcp26(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
@@ -200,13 +206,18 @@ start_run(cfg, codeCheck = FALSE)
 # BAU_NoCC #
 # Decomposition scenario. Remove climate impacts (NoCC) from BAU to isolate climate effects
 cfg$title <- "BAU_NoCC"
+# standard setting, but without CC
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
-cfg <- noCC(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # BAU_MITI #
 # Decomposition Scenario. Adds mitigation and land-use policies consistent with 1.5C by 2050 to BAU
 cfg$title <- "BAU_MITI"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- miti(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
@@ -214,6 +225,9 @@ start_run(cfg, codeCheck = FALSE)
 # EL2 #
 # Full EAT-Lancet Scenario (diet, productivity, FLW) without mitigation and higher climate impacts based on RCP 7.0
 cfg$title <- "EL2"
+# standard setting
+cfg <- setScenario(cfg, c("cc", "SSP2", "NPI"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
@@ -223,68 +237,88 @@ start_run(cfg, codeCheck = FALSE)
 # ELM #
 # Full EAT-Lancet scenario (diet, productivity, FLW) with mitigation policies consistent with 1.5C. Climate based on a lower climate impacts with RCP 2.6
 cfg$title <- "ELM"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
+cfg <- miti(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
-cfg <- miti(cfg = cfg)
 cfg <- rcp26(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # ELM_Diet #
 # Decomposition Scenario. Removes Diet from ELM
 cfg$title <- "ELM_DIET"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
+cfg <- miti(cfg = cfg)
 cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
-cfg <- miti(cfg = cfg)
 cfg <- rcp26(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # ELM_PROD #
 # Decomposition Scenario. Removed productivity trend from ELM
 cfg$title <- "ELM_PROD"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
+cfg <- miti(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- waste(cfg = cfg)
-cfg <- miti(cfg = cfg)
 cfg <- rcp26(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # ELM_WAST #
 # Decomposition Scenario. Removes FLW from ELM
 cfg$title <- "ELM_WAST"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
+cfg <- miti(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
-cfg <- miti(cfg = cfg)
 cfg <- rcp26(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # ELM_RCP70 #
 # Decomposition Scenario. Applies RCP 7.0 climate impacts to ELM
 cfg$title <- "ELM_RCP70"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
+cfg <- miti(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
-cfg <- miti(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # ELM_NoCC #
 # Decomposition Scenario. Removes climate impacts (NoCC) from ELM
 cfg$title <- "ELM_NoCC"
+# standard setting, but with NDC activated (for miti) and without CC
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
+cfg <- miti(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
-cfg <- miti(cfg = cfg)
-cfg <- noCC(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # ELM_MITI #
 # Decomposition Scenario. Removes climate mitigation and LUC policies from ELM
 cfg$title <- "ELM_MITI"
+# standard setting, but with NDC activated (for miti)
+cfg <- setScenario(cfg, c("cc", "SSP2", "NDC"))
+# scenario settings
 cfg <- bau(cfg = cfg)
 cfg <- diet(cfg = cfg)
 cfg <- prod(cfg = cfg)
diff --git a/scripts/start/projects/project_EAT2p0_DeepDive.R b/scripts/start/projects/project_EAT2p0_DeepDive.R
index bebf4dae73..a9a21192e9 100644
--- a/scripts/start/projects/project_EAT2p0_DeepDive.R
+++ b/scripts/start/projects/project_EAT2p0_DeepDive.R
@@ -28,15 +28,18 @@ cfg$force_download <- TRUE
 
 # Special outputs required for Deep Dive
 cfg$qos <- "standby_maxMem_dayMax"
-cfg$output <- c("output_check",
-                "extra/highres",
-                "extra/disaggregation",
-                "projects/FSEC_nitrogenPollution",
-                "projects/FSEC_water",
-                "agmip_report",
-                "runBlackmagicc",
-                # add output file: pb_report (magpie (special mif created by getReportPBindicators & remind mif (REMIND_generic_scenName.mif))
-                "rds_report")
+cfg$output <- c(
+  "output_check",
+  "extra/highres",
+  "extra/disaggregation",
+  "projects/FSEC_nitrogenPollution",
+  "projects/FSEC_water",
+  "projects/agmip_report",
+  "rds_report",
+  "runBlackmagicc"
+  # add output file: pb_report (magpie (special mif created by getReportPBindicators & remind mif (REMIND_generic_scenName.mif))
+
+)
 
 #######################
 # SCENARIO DEFINITION #
@@ -56,44 +59,39 @@ cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
 # RCP/GCM: 7p0 shocks on crops, livestock, labor
 # Trade: BAU
 bau <- function(cfg) {
-
   ### Components for Decomposition ###
   # Diets: exogenous EATLancet diet
-  cfg$gms$s15_exo_diet  <- 0             # default
+  cfg$gms$s15_exo_diet  <- 0 # default
   cfg$gms$c15_kcal_scen <- "healthy_BMI" # default (but not active b/c of s15_exo_diet = 0)
-  cfg$gms$c15_EAT_scen  <- "FLX"         # default (but not active b/c of s15_exo_diet = 0)
+  cfg$gms$c15_EAT_scen  <- "FLX" # default (but not active b/c of s15_exo_diet = 0)
   # Waste: half food waste
-  cfg$gms$s15_exo_waste  <- 0            # default
-  cfg$gms$s15_waste_scen <- 1.2          # default (but not active b/c of s15_exo_waste = 0)
+  cfg$gms$s15_exo_waste  <- 0 # default
+  cfg$gms$s15_waste_scen <- 1.2 # default (but not active b/c of s15_exo_waste = 0)
   # Default interest rate (for default productivity)
-  cfg$gms$s12_interest_lic <- 0.1        # default
-  cfg$gms$s12_interest_hic <- 0.04       # default
+  cfg$gms$s12_interest_lic <- 0.1 # default
+  cfg$gms$s12_interest_hic <- 0.04 # default
   # Default livestock productivity
-  cfg$gms$c70_feed_scen <- "ssp2"        # default
-  # Mitigation: no mitigation beyond NDC (NDC set in setScenario)
-  cfg$gms$c56_emis_policy      <- "none" 
-  cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive/remind/output/C_SSP2EU-DSPkB500-noDS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB500-noDS_betax-rem-5.mif"
-  cfg$gms$c56_pollutant_prices <- "none"
-  cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive/remind/output/C_SSP2EU-DSPkB500-noDS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB500-noDS_betax-rem-5.mif"
-  cfg$gms$c60_2ndgen_biodem    <- "none"
-
-  ### Deactivate certain sustainability standard settings
-  # bioenergy plantations can be irrigated
-  cfg$gms$c30_bioen_water <- "all"
-  # forest plantations allowed for afforestation under ghg price
-  cfg$gms$s32_aff_plantation <- 1
+  cfg$gms$c70_feed_scen <- "ssp2" # default
+  # Mitigation: no mitigation beyond NPi
+  cfg$gms$c56_emis_policy      <- "none"
+  cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-NPi-rem-5/REMIND_generic_C_SSP2EU-NPi-rem-5.mif"
+  cfg$gms$c56_pollutant_prices <- "coupling"
+  cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-NPi-rem-5/REMIND_generic_C_SSP2EU-NPi-rem-5.mif"
+  cfg$gms$c60_2ndgen_biodem    <- "coupling"
 
   # Setting REMIND scenario for blackmagicc
-  cfg$magicc_emis_scen <- "SSP2EU-DSPkB500-DS_betax"
-  
+  cfg$magicc_emis_scen <- "REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif"
+
   return(cfg)
 }
 
 ### Diet component ##
 # Globally achieves EL2 diet by 2050
 diet <- function(cfg) {
-  cfg$gms$s15_exo_diet  <- 3
-  
+  # Transition towards EL2 food intake recommendations until 2050
+  cfg$gms$s15_exo_diet <- 3
+  # Physical inactivity levels are reduced to 0 from 2020 to 2050
+  cfg$gms$c09_pal_scenario <- "SDP"
   return(cfg)
 }
 
@@ -114,7 +112,7 @@ prod <- function(cfg) {
 # Reduction (halving) of food loss and waste
 waste <- function(cfg) {
   # Waste: half food waste
-  cfg$gms$s15_exo_waste  <- 1
+  cfg$gms$s15_exo_waste <- 1
   cfg$gms$s15_waste_scen <- 1.2
   return(cfg)
 }
@@ -125,49 +123,42 @@ waste <- function(cfg) {
 # We use a GHG pricing pathway based on a peak budget of 500 with overshoot
 # starting from 2020 and diet shift.
 miti <- function(cfg) {
-  # NDCs
-  cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC"))
-
   # Mitigation: consistent with 1.5C considering Diet change
+  cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-DSPkB650-DS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif"
   cfg$gms$c56_pollutant_prices <- "coupling"
-  cfg$gms$c60_2ndgen_biodem    <- "coupling"
-  cfg$gms$c56_emis_policy      <- "ecoSysProtAll" 
+  cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-DSPkB650-DS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif"
+  cfg$gms$c60_2ndgen_biodem <- "coupling"
+  # ecoSysProtAll:               (Above ground CO2 emis from LUC in forest, forestry, natveg; All types of emis from peatland; All CH4 and N2O emis),
+  cfg$gms$c56_emis_policy <- "ecoSysProtAll"
 
   return(cfg)
 }
 
 # Bioenergy demand only. No carbon price on land included.
 bioenergy <- function(cfg) {
-  # NDCs
-  cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC"))
-
-  # No ghg pricing in land system
-  # Bioenergy demand from coupled REMIND-MAgPIE run where 1.5 is reached with ghg prices on land and considering diet shift
-  cfg$gms$c60_2ndgen_biodem    <- "coupling"
+  # Mitigation: only Bioenergy demand from coupled REMIND-MAgPIE run where 1.5 is reached with ghg prices on land and considering diet shift
+  cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-DSPkB650-DS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif"
+  cfg$gms$c60_2ndgen_biodem <- "coupling"
 
   return(cfg)
 }
 
 # CO2 from land use change is priced.
 priceCO2 <- function(cfg) {
-  # NDCs
-  cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC"))
-
-  # Mitigation: consistent with 1.5C considering Diet change
+  # Mitigation: only price land CO2
   cfg$gms$c56_pollutant_prices <- "coupling"
-  cfg$gms$c56_emis_policy      <- "ecoSysProtAll" 
+  cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-DSPkB650-DS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif"
+  cfg$gms$c56_emis_policy <- "ecoSysProtAll_agMgmtOff" #### double-check Florian or Leon
 
   return(cfg)
 }
 
 # Pricing of all CH4 and N2O emissions except for peatland
 priceNonCO2 <- function(cfg) {
-  # NDCs
-  cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC"))
-
-  # Mitigation: consistent with 1.5C considering Diet change
+  # Mitigation: only CH4 and N2O price
   cfg$gms$c56_pollutant_prices <- "coupling"
-  cfg$gms$c56_emis_policy      <- "ecoSysProtAll_agMgmtOff" 
+  cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-DSPkB650-DS_betax-rem-5/REMIND_generic_C_SSP2EU-DSPkB650-DS_betax-rem-5.mif"
+  cfg$gms$c56_emis_policy <- "ecoSysProtOff" ### double-check Florian or Leon
 
   return(cfg)
 }
@@ -177,37 +168,43 @@ priceNonCO2 <- function(cfg) {
 # SCENARIO RUNS #
 #################
 # BAU #
-# Business as usual scenario based on SSP2
+# Business as usual scenario based on SSP2 (NPis)
 cfg$title <- "BAU_NPi"
 cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
 cfg <- bau(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-cfg$title <- "BAU_NDC"
-cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
-cfg <- bau(cfg = cfg)
-start_run(cfg, codeCheck = FALSE)
-
-# BAU + EL2-Diet #
-# Decomposition scenario.
-# Globally achieves EL2 (Diet+Waste+Prod) by 2050
-cfg$title <- "BAU_Diet"
+### Composition ###
+# Mitigation components:
+# (1a) Nationally Determined Contributions (NDCs)
+#cfg$title <- "BAU_NDC"
+#cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+#cfg <- bau(cfg = cfg)
+# set path to bioenergy and prices to NDC run
+#cfg$path_to_report_ghgprices <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-NDC-rem-5/REMIND_generic_C_SSP2EU-NDC-rem-5.mif"
+#cfg$gms$c56_pollutant_prices <- "coupling"
+#cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-NDC-rem-5/REMIND_generic_C_SSP2EU-NDC-rem-5.mif"
+#cfg$gms$c60_2ndgen_biodem <- "coupling"
+#start_run(cfg, codeCheck = FALSE)
+# Note: Exclude NDC run for now. Starting point is NPi and we do not look at policies, but only mitigation measures (demand side vs. supply side)
+
+# (1b) BAU + Bioenergy #
+# Decomposition Scenario. Adds bioenergy demand from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
+cfg$title <- "BAU_Bioenergy"
 cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
 cfg <- bau(cfg = cfg)
-cfg <- diet(cfg = cfg)
-cfg <- prod(cfg = cfg)
-cfg <- waste(cfg = cfg)
+cfg <- bioenergy(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# BAU + Bioenergy #
-# Decomposition Scenario. Adds bioenergy demand from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
-cfg$title <- "BAU_Bioenergy"
+# (1c) BAU + NonCO2 pricing in land sector #
+# Decomposition Scenario. Adds non-CO2 pricing with ghg price from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
+cfg$title <- "BAU_NonCO2"
 cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
 cfg <- bau(cfg = cfg)
-cfg <- bioenergy(cfg = cfg)
+cfg <- priceNonCO2(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# BAU + pricing of CO2 in land sector #
+# (1d) BAU + pricing of CO2 in land sector #
 # Decomposition Scenario. Adds CO2 pricing on land-use change emissions with ghg price from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
 cfg$title <- "BAU_CO2"
 cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
@@ -215,75 +212,258 @@ cfg <- bau(cfg = cfg)
 cfg <- priceCO2(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# BAU + NonCO2 pricing in land sector #
-# Decomposition Scenario. Adds non-CO2 pricing with ghg price from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
-cfg$title <- "BAU_NonCO2"
+# (1a,b,c,d) BAU_MIT #
+# All production-side land-based mitigation measures
+cfg$title <- "BAU_Miti"
+# standard setting, but with NDC for miti
 cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
 cfg <- bau(cfg = cfg)
-cfg <- priceNonCO2(cfg = cfg)
+# Mitigation (CO2, non-CO2, bioenergy)
+cfg <- miti(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# MITI_Diet (mitigation - PHD) #
-# All production-side land-based mitigation measures, but no demand-side mitigation (diet change)
-cfg$title <- "MITI_Diet"
-cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+# BAU_MITI - bioenergy #
+# (1e) CO2 and non-CO2 pricing, but no bioenergy demand from REMIND
+cfg$title <- "BAUMITI_Bioenergy"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
+cfg <- bau(cfg = cfg)
+# Mitigation
+cfg <- miti(cfg = cfg)
+cfg$gms$c60_2ndgen_biodem <- "coupling"
+cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-NPi-rem-5/REMIND_generic_C_SSP2EU-NPi-rem-5.mif"
+start_run(cfg, codeCheck = FALSE)
+
+# BAU_MITI - non-CO2 #
+# (1f) CO2 pricing and bioenergy demand from REMIND, but no non-CO2 pricing in land-system
+cfg$title <- "BAUMITI_nonCO2"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
 cfg <- bau(cfg = cfg)
-# Mititgation
+# Mitigation
 cfg <- miti(cfg = cfg)
+# ecoSysProtAll_agMgmtOff:     (Above ground CO2 emis from LUC in forest, forestry, natveg; All types of emis from peatland; No further CH4/N2O/other emis related to ag. management)
+cfg$gms$c56_emis_policy <- "ecoSysProtAll_agMgmtOff"
+start_run(cfg, codeCheck = FALSE)
+
+# MITI_CO2 (mitigation - CO2) #
+# (1g) non-CO2 pricing and bioenergy demand from REMIND, but no CO2 pricing in land-system
+cfg$title <- "BAUMITI_CO2"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
+cfg <- bau(cfg = cfg)
+# Mitigation
+cfg <- miti(cfg = cfg)
+# ecoSysProtOff:               (All CH4 and N2O emis except peatland),
+cfg$gms$c56_emis_policy <- "ecoSysProtOff"
+start_run(cfg, codeCheck = FALSE)
+
+
+# BAU + EL2-Diet #
+# PHD components:
+# (1e) Productivity
+#cfg$title <- "BAU_Prod"
+#cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+#cfg <- bau(cfg = cfg)
+#cfg <- prod(cfg = cfg)
+#start_run(cfg, codeCheck = FALSE)
+
+# (1f) Waste
+cfg$title <- "BAU_Waste"
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+cfg <- bau(cfg = cfg)
+cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
+# (1g) Diet change
+cfg$title <- "BAU_Diet"
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+cfg <- bau(cfg = cfg)
+cfg <- diet(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+# (1e,f,g) Demand-side options (Diet+Waste) by 2050
+cfg$title <- "BAU_Dem"
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+cfg <- bau(cfg = cfg)
+cfg <- diet(cfg = cfg)
+#cfg <- prod(cfg = cfg)
+cfg <- waste(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+
+### Single measure Decomposition ###
+# (2a) MITI_NDC #
+# All production-side land-based mitigation measures and demand-side mitigation (diet change), but no NDCs
+#cfg$title <- "MITI_NDC"
+# standard setting, but with NDC for miti
+#cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+# BAU settings
+#cfg <- bau(cfg = cfg)
+# Mitigation (CO2, non-CO2, bioenergy)
+#cfg <- miti(cfg = cfg)
+# PHD (diet, prod, waste)
+#cfg <- diet(cfg = cfg)
+#cfg <- prod(cfg = cfg)
+#cfg <- waste(cfg = cfg)
+#start_run(cfg, codeCheck = FALSE)
+
 # MITI_Bioenergy (mitigation - bioenergy) #
-# CO2 and non-CO2 pricing and demand-side mitigation (diet change), but no bioenergy demand from REMIND
+# (2b) CO2 and non-CO2 pricing and demand-side mitigation (diet change), but no bioenergy demand from REMIND
 cfg$title <- "MITI_Bioenergy"
-cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
+cfg <- bau(cfg = cfg)
+# Mitigation
+cfg <- miti(cfg = cfg)
+cfg$gms$c60_2ndgen_biodem <- "coupling"
+cfg$path_to_report_bioenergy <- "/p/projects/magpie/users/beier/EL2_DeepDive_new/remind/output/C_SSP2EU-NPi-rem-5/REMIND_generic_C_SSP2EU-NPi-rem-5.mif"
+# PHD
+cfg <- diet(cfg = cfg)
+#cfg <- prod(cfg = cfg)
+cfg <- waste(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+# MITI_nonCO2 (mitigation - non-CO2) #
+# (2c) CO2 pricing and bioenergy demand from REMIND and demand-side mitigation (diet change), but no non-CO2 pricing in land-system
+cfg$title <- "MITI_nonCO2"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
 cfg <- bau(cfg = cfg)
-# Mititgation
+# Mitigation
 cfg <- miti(cfg = cfg)
-cfg$gms$c60_2ndgen_biodem    <- "none"
+# ecoSysProtAll_agMgmtOff:     (Above ground CO2 emis from LUC in forest, forestry, natveg; All types of emis from peatland; No further CH4/N2O/other emis related to ag. management)
+cfg$gms$c56_emis_policy <- "ecoSysProtAll_agMgmtOff"
 # PHD
 cfg <- diet(cfg = cfg)
-cfg <- prod(cfg = cfg)
+#cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
 # MITI_CO2 (mitigation - CO2) #
-# non-CO2 pricing and bioenergy demand from REMIND and demand-side mitigation (diet change), but no CO2 pricing in land-system
+# (2d) non-CO2 pricing and bioenergy demand from REMIND and demand-side mitigation (diet change), but no CO2 pricing in land-system
 cfg$title <- "MITI_CO2"
-cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
 cfg <- bau(cfg = cfg)
-# Mititgation
+# Mitigation
 cfg <- miti(cfg = cfg)
-cfg$gms$c56_emis_policy      <- "ecoSysProtAll_agMgmtOff" 
+# ecoSysProtOff:               (All CH4 and N2O emis except peatland),
+cfg$gms$c56_emis_policy <- "ecoSysProtOff"
 # PHD
 cfg <- diet(cfg = cfg)
-cfg <- prod(cfg = cfg)
+#cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
-# MITI_nonCO2 (mitigation - non-CO2) #
-# CO2 pricing and bioenergy demand from REMIND and demand-side mitigation (diet change), but no non-CO2 pricing in land-system
-cfg$title <- "MITI_nonCO2"
-cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+# MITI_MITI #
+# (2a,b,c,d) All demand-side mitigation (PHD, but no other miti measures)
+cfg$title <- "MITI_Miti"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
 cfg <- bau(cfg = cfg)
-# Mititgation
+# PHD (diet, prod, waste)
+cfg <- diet(cfg = cfg)
+#cfg <- prod(cfg = cfg)
+cfg <- waste(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+# MITI_Waste #
+# (2f) All production-side land-based mitigation measures and demand-side mitigation without Waste
+cfg$title <- "MITI_Waste"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
+cfg <- bau(cfg = cfg)
+# Mitigation (CO2, non-CO2, bioenergy)
 cfg <- miti(cfg = cfg)
-cfg$gms$c56_emis_policy      <- "ecoSysProtAll" 
-# PHD
+# PHD (diet, prod, waste)
+cfg <- diet(cfg = cfg)
+#cfg <- prod(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+# MITI_Diet #
+# (2g) All production-side land-based mitigation measures and demand-side mitigation without Diet
+cfg$title <- "MITI_Diet"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
+cfg <- bau(cfg = cfg)
+# Mitigation (CO2, non-CO2, bioenergy)
+cfg <- miti(cfg = cfg)
+# PHD (diet, prod, waste)
+#cfg <- prod(cfg = cfg)
+cfg <- waste(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+# MITI_PHD (mitigation - PHD) #
+# (2e,f,g) All production-side land-based mitigation measures, but no demand-side mitigation
+cfg$title <- "MITI_Dem"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
+cfg <- bau(cfg = cfg)
+# Mitigation
+cfg <- miti(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+### Combining demand-side changes with single mitigation measures ###
+# (3b) Demand-side change + Bioenergy #
+# Decomposition Scenario with demand-side changes. Adds bioenergy demand from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
+cfg$title <- "DEM_Bioenergy"
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+cfg <- bau(cfg = cfg)
+cfg <- bioenergy(cfg = cfg)
+# Demand-side change (diet, waste)
 cfg <- diet(cfg = cfg)
-cfg <- prod(cfg = cfg)
+# cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)
 
+# (3c) Demand-side + NonCO2 pricing in land sector #
+# Decomposition Scenario with demand-side changes. Adds non-CO2 pricing with ghg price from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
+cfg$title <- "DEM_NonCO2"
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+cfg <- bau(cfg = cfg)
+cfg <- priceNonCO2(cfg = cfg)
+# Demand-side change (diet, waste)
+cfg <- diet(cfg = cfg)
+# cfg <- prod(cfg = cfg)
+cfg <- waste(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
 
-# MITI_Full #
+# (3d) Demand-side + pricing of CO2 in land sector #
+# Decomposition Scenario with demand-side changes. Adds CO2 pricing on land-use change emissions with ghg price from coupled run with land-use policies consistent with 1.5C by 2050 to BAU
+cfg$title <- "DEM_CO2"
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+cfg <- bau(cfg = cfg)
+cfg <- priceCO2(cfg = cfg)
+# Demand-side change (diet, waste)
+cfg <- diet(cfg = cfg)
+# cfg <- prod(cfg = cfg)
+cfg <- waste(cfg = cfg)
+start_run(cfg, codeCheck = FALSE)
+
+### All measures ###
+# MITI_All #
 # All production-side land-based mitigation measures and demand-side mitigation (diet change)
-cfg$title <- "MITI_Full"
-cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NDC", "EL2_default"))
+cfg$title <- "MITI_All"
+# standard setting, but with NDC for miti
+cfg <- setScenario(cfg, c("nocc_hist", "SSP2", "NPI", "EL2_default"))
+# BAU settings
 cfg <- bau(cfg = cfg)
-# Mititgation
+# Mitigation (CO2, non-CO2, bioenergy)
 cfg <- miti(cfg = cfg)
-# PHD
+# PHD (diet, prod, waste)
 cfg <- diet(cfg = cfg)
-cfg <- prod(cfg = cfg)
+#cfg <- prod(cfg = cfg)
 cfg <- waste(cfg = cfg)
 start_run(cfg, codeCheck = FALSE)