diff --git a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2.cfg b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2.cfg
index aebd1cc63..95402f146 100644
--- a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2.cfg
+++ b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2.cfg
@@ -42,44 +42,127 @@ BeamRemnants:saturation 5
 4332:tau0 = 0.0803
 
 ### Force golden charm hadrons decay modes for D2H studies
-### add D0 decays absent in PYTHIA8 decay table and set BRs from PDG for other
-421:oneChannel = 1 0.0389 0 -321 211
-421:addChannel = 1 0.00389 0 -321 211 111
-### add D+ decays absent in PYTHIA8 decay table and set BRs from PDG for other
-411:oneChannel = 1 0.0752 0 -321 211 211
-411:addChannel = 1 0.0104 0 -313 211
-411:addChannel = 1 0.0156 0 311 211
-411:addChannel = 1 0.0752 0 333 211 # to have the same amount of D+->KKpi and D+->Kpipi
-## add Lc decays absent in PYTHIA8 decay table and set BRs from PDG for other
-4122:oneChannel = 1 0.0196 100 2212 -313
-4122:addChannel = 1 0.0108 100 2224 -321
-4122:addChannel = 1 0.022 100 102134 211
-4122:addChannel = 1 0.035 0 2212 -321 211
-4122:addChannel = 1 0.0159 0 2212 311
-### add Xic+ decays absent in PYTHIA8 decay table
-4232:addChannel = 1 0.2 0 2212 -313
-4232:addChannel = 1 0.2 0 2212 -321 211
-4232:addChannel = 1 0.2 0 3324 211
-4232:addChannel = 1 0.2 0 3312 211 211
+# HF decays
+### BR are set to yield 50% of signal in golden channel and uniform abundance of corr. bkg channels (weighted by BR from PDG) 
+###
+### D0 decays
+### D0 -> K- π+ (50%)
+421:oneChannel = 1 0.50000 0 -321 211              ### D0 -> K- π+ 3.94% 
+### D0 -> K- π+ π0 (12.50%)
+421:addChannel = 1 0.00625 0 -321 211 111          ### D0 -> K- π+ π0 (non-resonant) 1.15% (e.g. 115/(115+231+195+1120)*0.2)
+421:addChannel = 1 0.08750 0  213 -321             ### D0 -> rho+ K- 11.2%
+421:addChannel = 1 0.01250 0 -313 111              ### D0 -> antiK*0(892) π0 1.95%
+421:addChannel = 1 0.01875 0 -323 211              ### D0 -> K*-(892) π+ 2.31%
+### D0 -> π- π+ (12.50%)
+421:addChannel = 1 0.12500 0 -211 211              ### D0 -> π- π+ (non-resonant) 1.0e-4
+### D0 -> π- π+ π0 (12.50%)
+421:addChannel = 1 0.08750 0  213 -211             ### D0 -> rho+ π- 1.01%
+421:addChannel = 1 0.03750 0 -211 211 111          ### D0 -> π- π+ π0 (non-resonant) 1.3e-4
+### D0 -> K- K+ (12.50%)
+421:addChannel = 1 0.12500 0 -321 321              ### D0 -> K- K+ (non-resonant) 4.08e-3
+
+### D+ decays
+### D+ -> K- π+ π+ (50%)
+411:oneChannel = 1 0.40189 0 -321 211 211          ### D+ -> K- π+ π+ 9.38%
+411:addChannel = 1 0.05356 0 -10311 211            ### D+ -> antiK*0(1430) π+ 1.25%
+411:addChannel = 1 0.04455 0 -313 211              ### D+ -> K*0(892) pi+ 1.04%
+### D+ -> K- π+ π+ π0 (small, 3%)
+411:addChannel = 1 0.03000 0 -321 211 211 111      ### D+ -> K- π+ π+ π0 6.25%
+### D+ -> K- K+ π+ (36.00%, set 25% for D+ -> φ π+, 11% for the rest)
+411:addChannel = 1 0.25000 0  333 211              ### D+ -> φ π+ 2.69e-3 !needed for signal
+411:addChannel = 1 0.03929 0 -313 321              ### D+ -> K*0(892) K+ 2.49e-3
+411:addChannel = 1 0.02865 0 -10311 321            ### D+ -> antiK*0(1430) K+ 1.82e-3
+411:addChannel = 1 0.04206 0 -321 321 211          ### D+ -> K- K+ π+ (non-resonant) 2.68e-3 
+### D+ -> π- π+ π+ (11.00%)
+411:addChannel = 1 0.02911 0  113 211               ### D+ -> rho0 π+ 8.4e-4
+411:addChannel = 1 0.01618 0  225 211               ### D+ -> f2(1270) π+ 4.6e-4
+411:addChannel = 1 0.06471 0 -211 211 211           ### D+ -> π- π+ π+ (non-resonant) 1.0e-4
+
+### Ds+ decays
+### Ds+ -> K- K+ π+ (50%)
+431:oneChannel = 1 0.50000 0  333 211             ### Ds+ -> φ(1020) π+ 2.21%
+431:addChannel = 1 0.15000 0 -313 321             ### Ds+ -> antiK*(892) K+ 2.58%
+### Ds+ -> K- K+ π+ π0 (small, 2%)
+431:addChannel = 1 0.02000 0  333 213              ### Ds+ -> φ(1020) rho 5.50%
+### Ds+ -> π- π+ π+ (11.00%)
+431:addChannel = 1 0.00220 0  113 211             ### Ds+ -> rho π+ 1.1e-4
+431:addChannel = 1 0.00220 0  225 211             ### Ds+ -> f2(1270) π+ 1.4e-3
+431:addChannel = 1 0.10560 0 -211 211 211         ### Ds+ -> π- π+ π+ 9.12e-3 (s-wave)
+### Ds+ -> π- K+ π+ (11.00%)
+431:addChannel = 1 0.03080 0  313 211             ### Ds+ -> K*(892)0 π+ 1.67e-3
+431:addChannel = 1 0.02200 0  10221 321           ### Ds+ -> f0(1370) K+ 1.2e-3
+431:addChannel = 1 0.03960 0  113 321             ### Ds+ -> rho0 K+ 2.17e-3
+431:addChannel = 1 0.01760 0 -211 321 211         ### Ds+ -> π- K+ π+ (non-resonant) 1.16-3
+### Ds+ -> π+ π- π+ π0 (11.00%)
+431:addChannel = 1 0.11000 0  221 211             ### Ds+ -> eta π+ -> π0 π+ π+ π- (affects D+ golden channel)
+
+## Λc decays
+### Λc+ -> p K- π+ (36%)
+4122:oneChannel = 1 0.14400 0 2212 -321 211       ### Λc+ -> p K- π+ (non-resonant) 3.5%
+4122:addChannel = 1 0.08100 100 2212 -313         ### Λc+ -> p K*0(892) 1.96%
+4122:addChannel = 1 0.04500 100 2224 -321         ### Λc+ -> Delta++ K- 1.08%
+4122:addChannel = 1 0.09000 100 102134 211        ### Λc+ -> Lambda(1520) K- 2.20e-3
+### Λc+ -> p K0S (36%)
+4122:addChannel = 1 0.36000 0 2212 311            ### Λc+ -> p K0S 1.59%
+### Λc+ -> p K- π+ π0 (small, 3%)
+4122:addChannel = 1 0.03000 0 2212 -321 211 111   ### Λc+ -> p K- π+ π0 (non-resonant) 4.6%
+### Λc+ -> p π- π+ (12.50%)
+4122:addChannel = 1 0.12500 0 2212 -211 211       ### Λc+ -> p π+ π+ 4.59%
+### Λc+ -> p K- K+ (12.50%)
+4122:addChannel = 1 0.12500 0 2212 333            ### Λc+ -> p phi 1.06%
+
+## Xic decays
+### Ξc+ -> p K- π+ (35%)
+4232:oneChannel = 1 0.17500 0 2212 -321 211        ### Ξc+ -> p K- π+ 6.18e-3
+4232:addChannel = 1 0.17500 0 2212 -313            ### Ξc+ -> p antiK*0(892)
+### Ξc+ -> Ξ- π+ π+ (35%) (set the same as Ξc+ -> p K- π+)
+4232:addChannel = 1 0.35000 0 3312 211 211        ### Ξc+ -> Ξ- π+ π+ 2.86%
+### Ξc+ -> p φ (10%)
+4232:addChannel = 1 0.10000 0 2212 333             ### Ξc+ -> p φ
+### Ξc+ -> sigma+ π+ π- (10%)
+4232:addChannel = 1 0.12500 0 3222 -211 211        ### Ξc+ -> sigma+ π- π+ 1.37%
+### Ξc+ -> Ξ*0 π+ (10%)
+4232:addChannel = 1 0.12500 0 3324 211
+
 ### add Xic0 decays absent in PYTHIA8 decay table
 4132:addChannel = 1 0.0143 0 3312 211
+
 ### add OmegaC decays absent in PYTHIA8 decay table
 4332:addChannel = 1 0.5 0 3334 211
 4332:addChannel = 1 0.5 0 3312 211
 
-### K* -> K pi
+# Allow the decay of resonances in the decay chain
+### K*0(892) -> K- π+
 313:onMode = off
 313:onIfAll = 321 211
-### for Ds -> Phi pi+
+### K*(892)+ -> K- π0
+323:onMode = off
+323:onIfAll = 321 111
+### K*(1430)0 -> K- π+
+10311:onMode = off
+10311:onIfAll = 321 211
+### rho+ -> π+ π0
+213:onMode = off
+213:onIfAll = 211 111
+### φ -> K+ K-
 333:onMode = off
 333:onIfAll = 321 321
-### for D0 -> rho0 pi+ k-
+### rho0 -> π+ π-
 113:onMode = off
 113:onIfAll = 211 211
-### for Lambda_c -> Delta++ K-
+### f2(1270) -> π+ π-
+225:onMode = off
+225:onIfAll = 211 211
+### f0(1370) -> π+ π-
+10221:onMode = off
+10221:onIfAll = 211 211
+### eta -> π+ π-
+221:onMode = off
+221:onIfAll =  111 211 211
+### for Λc -> Delta++ K-
 2224:onMode = off
 2224:onIfAll = 2212 211
-### for Lambda_c -> Lambda(1520) K-
+### for Λc -> Lambda(1520) K-
 102134:onMode = off
 102134:onIfAll = 2212 321
 ### for Xic0 -> pi Xi -> pi pi Lambda -> pi pi pi p 
@@ -92,7 +175,7 @@ BeamRemnants:saturation 5
 3334:onMode = off
 3334:onIfAll = 3122 -321
 
-### switch off all decay channels
+# switch off all decay channels
 411:onMode = off
 421:onMode = off
 431:onMode = off
@@ -102,41 +185,100 @@ BeamRemnants:saturation 5
 443:onMode = off
 4332:onMode = off
 
-### D0 -> K pi
+# Allow the decay of HF
+### D0 -> K π
 421:onIfMatch = 321 211
-### D0 -> K pi pi0
+### D0 -> K π π0
 421:onIfMatch = 321 211 111
+### D0 -> rho K
+421:onIfMatch = 213 321
+### D0 -> antiK*0 π0
+421:onIfMatch = 313 111
+### D0 -> K*- π+
+421:onIfMatch = 323 211 
+### D0 -> π π
+421:onIfMatch = 211 211
+### D0 -> rho+ π-
+421:onIfMatch = 213 -211
+### D0 -> π π π0
+421:onIfMatch = 211 211 111
+### D0 -> K K
+421:onIfMatch = 321 321
 
-### D+/- -> K pi pi 
+### D+/- -> K π π 
 411:onIfMatch = 321 211 211
-### D+/- -> K* pi
+### D+/- -> K π π 
+411:onIfMatch = 321 211 211 111
+### D+/- -> K* π
 411:onIfMatch = 313 211
-### D+/- -> phi pi
+### D+/- -> K* K
+411:onIfMatch = 313 321
+### D+/- -> antiK* π
+411:onIfMatch = 10311 211
+### D+/- -> antiK* K
+411:onIfMatch = 10311 321
+### D+/- -> φ π
 411:onIfMatch = 333 211
+### D+/- -> K K π 
+411:onIfMatch = 321 321 211
+### D+/- -> f2(1270) π
+411:onIfMatch = 225 211
+### D+/- -> rho π
+411:onIfMatch = 113 211
+### D+/- -> π π π
+411:onIfMatch = 211 211 211
 
-### D_s -> K K*
-431:onIfMatch = 321 313
-### D_s -> Phi pi
+### Ds -> φ π
 431:onIfMatch = 333 211
+### Ds -> K* K
+431:onIfMatch = 313 321
+### Ds -> φ rho+
+431:onIfMatch = 333 213
+### Ds -> rho π
+431:onIfMatch = 113 211
+### Ds -> f2 π
+431:onIfMatch = 225 211
+### Ds -> π π π
+431:onIfMatch = 211 211 211
+### Ds -> K*(892)0 π+
+431:onIfMatch = 313 211
+### Ds -> f0(1370) K+
+431:onIfMatch = 10221 321
+### Ds -> rho0 K+
+431:onIfMatch = 113 321
+### Ds -> K π π
+431:onIfMatch =  321 211 211
+### Ds -> eta π+
+431:onIfMatch = 221 211
 
-### Lambda_c -> p K*
+### Λc -> pK0s
+4122:onIfMatch = 2212 311 
+### Λc -> p K- π+ π0
+4122:onIfMatch = 2212 321 211
+### Λc -> p K*
 4122:onIfMatch = 2212 313
-### Lambda_c -> Delta K
+### Λc -> Delta++ K
 4122:onIfMatch = 2224 321
-### Lambda_c -> Lambda(1520) pi
+### Λc -> Lambda(1520) π
 4122:onIfMatch = 102134 211
-### Lambda_c -> p K pi
-4122:onIfMatch = 2212 321 211
-### Lambda_c -> pK0s
-4122:onIfMatch = 2212 311 
+### Λc -> p K- π+ π0
+4122:onIfMatch = 2212 321 211 111
+### Λc -> p π π
+4122:onIfMatch = 2212 211 211
+### Λc -> p K K
+4122:onIfMatch = 2212 333
 
-### Xic+ -> pK*0
-4232:onIfMatch = 2212 313
-### Xic+ -> p K- pi+
+### Ξc+ -> p K- π+
 4232:onIfMatch = 2212 321 211
-### Xic+ -> Xi*0 pi+, Xi*->Xi- pi+
+### Ξc+ -> p antiK*0(892)
+4232:onIfMatch = 2212 313
+### Ξc+ -> p φ
+4232:onIfMatch = 2212 333
+### Ξc+ -> sigma- π+ π+
+4232:onIfMatch = 3222 211 211
+### Ξc+ -> Ξ*0 π+, Ξ*0 -> Ξ- π+
 4232:onIfMatch = 3324 211
-### Xic+ -> Xi- pi+ pi+
+### Ξc+ -> Ξ- π+ π+
 4232:onIfMatch = 3312 211 211
     
 ### Xic0 -> Xi- pi+
@@ -145,4 +287,4 @@ BeamRemnants:saturation 5
 ### Omega_c -> Omega pi
 4332:onIfMatch = 3334 211
 ### Omega_c -> Xi pi
-4332:onIfMatch = 3312 211
+4332:onIfMatch = 3312 211
\ No newline at end of file
diff --git a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_hardQCD_5TeV.cfg b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_hardQCD_5TeV.cfg
index cbce46503..d75c500ac 100644
--- a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_hardQCD_5TeV.cfg
+++ b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_hardQCD_5TeV.cfg
@@ -46,44 +46,127 @@ BeamRemnants:saturation 5
 4332:tau0 = 0.0803
 
 ### Force golden charm hadrons decay modes for D2H studies
-### add D0 decays absent in PYTHIA8 decay table and set BRs from PDG for other
-421:oneChannel = 1 0.0389 0 -321 211
-421:addChannel = 1 0.00389 0 -321 211 111
-### add D+ decays absent in PYTHIA8 decay table and set BRs from PDG for other
-411:oneChannel = 1 0.0752 0 -321 211 211
-411:addChannel = 1 0.0104 0 -313 211
-411:addChannel = 1 0.0156 0 311 211
-411:addChannel = 1 0.0752 0 333 211 # to have the same amount of D+->KKpi and D+->Kpipi
-## add Lc decays absent in PYTHIA8 decay table and set BRs from PDG for other
-4122:oneChannel = 1 0.0196 100 2212 -313
-4122:addChannel = 1 0.0108 100 2224 -321
-4122:addChannel = 1 0.022 100 102134 211
-4122:addChannel = 1 0.035 0 2212 -321 211
-4122:addChannel = 1 0.0159 0 2212 311
-### add Xic+ decays absent in PYTHIA8 decay table
-4232:addChannel = 1 0.2 0 2212 -313
-4232:addChannel = 1 0.2 0 2212 -321 211
-4232:addChannel = 1 0.2 0 3324 211
-4232:addChannel = 1 0.2 0 3312 211 211
+# HF decays
+### BR are set to yield 50% of signal in golden channel and uniform abundance of corr. bkg channels (weighted by BR from PDG) 
+###
+### D0 decays
+### D0 -> K- π+ (50%)
+421:oneChannel = 1 0.50000 0 -321 211              ### D0 -> K- π+ 3.94% 
+### D0 -> K- π+ π0 (12.50%)
+421:addChannel = 1 0.00625 0 -321 211 111          ### D0 -> K- π+ π0 (non-resonant) 1.15% (e.g. 115/(115+231+195+1120)*0.2)
+421:addChannel = 1 0.08750 0  213 -321             ### D0 -> rho+ K- 11.2%
+421:addChannel = 1 0.01250 0 -313 111              ### D0 -> antiK*0(892) π0 1.95%
+421:addChannel = 1 0.01875 0 -323 211              ### D0 -> K*-(892) π+ 2.31%
+### D0 -> π- π+ (12.50%)
+421:addChannel = 1 0.12500 0 -211 211              ### D0 -> π- π+ (non-resonant) 1.0e-4
+### D0 -> π- π+ π0 (12.50%)
+421:addChannel = 1 0.08750 0  213 -211             ### D0 -> rho+ π- 1.01%
+421:addChannel = 1 0.03750 0 -211 211 111          ### D0 -> π- π+ π0 (non-resonant) 1.3e-4
+### D0 -> K- K+ (12.50%)
+421:addChannel = 1 0.12500 0 -321 321              ### D0 -> K- K+ (non-resonant) 4.08e-3
+
+### D+ decays
+### D+ -> K- π+ π+ (50%)
+411:oneChannel = 1 0.40189 0 -321 211 211          ### D+ -> K- π+ π+ 9.38%
+411:addChannel = 1 0.05356 0 -10311 211            ### D+ -> antiK*0(1430) π+ 1.25%
+411:addChannel = 1 0.04455 0 -313 211              ### D+ -> K*0(892) pi+ 1.04%
+### D+ -> K- π+ π+ π0 (small, 3%)
+411:addChannel = 1 0.03000 0 -321 211 211 111      ### D+ -> K- π+ π+ π0 6.25%
+### D+ -> K- K+ π+ (36.00%, set 25% for D+ -> φ π+, 11% for the rest)
+411:addChannel = 1 0.25000 0  333 211              ### D+ -> φ π+ 2.69e-3 !needed for signal
+411:addChannel = 1 0.03929 0 -313 321              ### D+ -> K*0(892) K+ 2.49e-3
+411:addChannel = 1 0.02865 0 -10311 321            ### D+ -> antiK*0(1430) K+ 1.82e-3
+411:addChannel = 1 0.04206 0 -321 321 211          ### D+ -> K- K+ π+ (non-resonant) 2.68e-3 
+### D+ -> π- π+ π+ (11.00%)
+411:addChannel = 1 0.02911 0  113 211               ### D+ -> rho0 π+ 8.4e-4
+411:addChannel = 1 0.01618 0  225 211               ### D+ -> f2(1270) π+ 4.6e-4
+411:addChannel = 1 0.06471 0 -211 211 211           ### D+ -> π- π+ π+ (non-resonant) 1.0e-4
+
+### Ds+ decays
+### Ds+ -> K- K+ π+ (50%)
+431:oneChannel = 1 0.50000 0  333 211             ### Ds+ -> φ(1020) π+ 2.21%
+431:addChannel = 1 0.15000 0 -313 321             ### Ds+ -> antiK*(892) K+ 2.58%
+### Ds+ -> K- K+ π+ π0 (small, 2%)
+431:addChannel = 1 0.02000 0  333 213              ### Ds+ -> φ(1020) rho 5.50%
+### Ds+ -> π- π+ π+ (11.00%)
+431:addChannel = 1 0.00220 0  113 211             ### Ds+ -> rho π+ 1.1e-4
+431:addChannel = 1 0.00220 0  225 211             ### Ds+ -> f2(1270) π+ 1.4e-3
+431:addChannel = 1 0.10560 0 -211 211 211         ### Ds+ -> π- π+ π+ 9.12e-3 (s-wave)
+### Ds+ -> π- K+ π+ (11.00%)
+431:addChannel = 1 0.03080 0  313 211             ### Ds+ -> K*(892)0 π+ 1.67e-3
+431:addChannel = 1 0.02200 0  10221 321           ### Ds+ -> f0(1370) K+ 1.2e-3
+431:addChannel = 1 0.03960 0  113 321             ### Ds+ -> rho0 K+ 2.17e-3
+431:addChannel = 1 0.01760 0 -211 321 211         ### Ds+ -> π- K+ π+ (non-resonant) 1.16-3
+### Ds+ -> π+ π- π+ π0 (11.00%)
+431:addChannel = 1 0.11000 0  221 211             ### Ds+ -> eta π+ -> π0 π+ π+ π- (affects D+ golden channel)
+
+## Λc decays
+### Λc+ -> p K- π+ (36%)
+4122:oneChannel = 1 0.14400 0 2212 -321 211       ### Λc+ -> p K- π+ (non-resonant) 3.5%
+4122:addChannel = 1 0.08100 100 2212 -313         ### Λc+ -> p K*0(892) 1.96%
+4122:addChannel = 1 0.04500 100 2224 -321         ### Λc+ -> Delta++ K- 1.08%
+4122:addChannel = 1 0.09000 100 102134 211        ### Λc+ -> Lambda(1520) K- 2.20e-3
+### Λc+ -> p K0S (36%)
+4122:addChannel = 1 0.36000 0 2212 311            ### Λc+ -> p K0S 1.59%
+### Λc+ -> p K- π+ π0 (small, 3%)
+4122:addChannel = 1 0.03000 0 2212 -321 211 111   ### Λc+ -> p K- π+ π0 (non-resonant) 4.6%
+### Λc+ -> p π- π+ (12.50%)
+4122:addChannel = 1 0.12500 0 2212 -211 211       ### Λc+ -> p π+ π+ 4.59%
+### Λc+ -> p K- K+ (12.50%)
+4122:addChannel = 1 0.12500 0 2212 333            ### Λc+ -> p phi 1.06%
+
+## Xic decays
+### Ξc+ -> p K- π+ (35%)
+4232:oneChannel = 1 0.17500 0 2212 -321 211        ### Ξc+ -> p K- π+ 6.18e-3
+4232:addChannel = 1 0.17500 0 2212 -313            ### Ξc+ -> p antiK*0(892)
+### Ξc+ -> Ξ- π+ π+ (35%) (set the same as Ξc+ -> p K- π+)
+4232:addChannel = 1 0.35000 0 3312 211 211        ### Ξc+ -> Ξ- π+ π+ 2.86%
+### Ξc+ -> p φ (10%)
+4232:addChannel = 1 0.10000 0 2212 333             ### Ξc+ -> p φ
+### Ξc+ -> sigma+ π+ π- (10%)
+4232:addChannel = 1 0.12500 0 3222 -211 211        ### Ξc+ -> sigma+ π- π+ 1.37%
+### Ξc+ -> Ξ*0 π+ (10%)
+4232:addChannel = 1 0.12500 0 3324 211
+
 ### add Xic0 decays absent in PYTHIA8 decay table
 4132:addChannel = 1 0.0143 0 3312 211
+
 ### add OmegaC decays absent in PYTHIA8 decay table
 4332:addChannel = 1 0.5 0 3334 211
 4332:addChannel = 1 0.5 0 3312 211
 
-### K* -> K pi
+# Allow the decay of resonances in the decay chain
+### K*0(892) -> K- π+
 313:onMode = off
 313:onIfAll = 321 211
-### for Ds -> Phi pi+
+### K*(892)+ -> K- π0
+323:onMode = off
+323:onIfAll = 321 111
+### K*(1430)0 -> K- π+
+10311:onMode = off
+10311:onIfAll = 321 211
+### rho+ -> π+ π0
+213:onMode = off
+213:onIfAll = 211 111
+### φ -> K+ K-
 333:onMode = off
 333:onIfAll = 321 321
-### for D0 -> rho0 pi+ k-
+### rho0 -> π+ π-
 113:onMode = off
 113:onIfAll = 211 211
-### for Lambda_c -> Delta++ K-
+### f2(1270) -> π+ π-
+225:onMode = off
+225:onIfAll = 211 211
+### f0(1370) -> π+ π-
+10221:onMode = off
+10221:onIfAll = 211 211
+### eta -> π+ π-
+221:onMode = off
+221:onIfAll =  111 211 211
+### for Λc -> Delta++ K-
 2224:onMode = off
 2224:onIfAll = 2212 211
-### for Lambda_c -> Lambda(1520) K-
+### for Λc -> Lambda(1520) K-
 102134:onMode = off
 102134:onIfAll = 2212 321
 ### for Xic0 -> pi Xi -> pi pi Lambda -> pi pi pi p 
@@ -96,7 +179,7 @@ BeamRemnants:saturation 5
 3334:onMode = off
 3334:onIfAll = 3122 -321
 
-### switch off all decay channels
+# Switch off all decay channels
 411:onMode = off
 421:onMode = off
 431:onMode = off
@@ -106,41 +189,100 @@ BeamRemnants:saturation 5
 443:onMode = off
 4332:onMode = off
 
-### D0 -> K pi
+# Allow the decay of HF
+### D0 -> K π
 421:onIfMatch = 321 211
-### D0 -> K pi pi0
+### D0 -> K π π0
 421:onIfMatch = 321 211 111
+### D0 -> rho K
+421:onIfMatch = 213 321
+### D0 -> antiK*0 π0
+421:onIfMatch = 313 111
+### D0 -> K*- π+
+421:onIfMatch = 323 211 
+### D0 -> π π
+421:onIfMatch = 211 211
+### D0 -> rho+ π-
+421:onIfMatch = 213 -211
+### D0 -> π π π0
+421:onIfMatch = 211 211 111
+### D0 -> K K
+421:onIfMatch = 321 321
 
-### D+/- -> K pi pi 
+### D+/- -> K π π 
 411:onIfMatch = 321 211 211
-### D+/- -> K* pi
+### D+/- -> K π π 
+411:onIfMatch = 321 211 211 111
+### D+/- -> K* π
 411:onIfMatch = 313 211
-### D+/- -> phi pi
+### D+/- -> K* K
+411:onIfMatch = 313 321
+### D+/- -> antiK* π
+411:onIfMatch = 10311 211
+### D+/- -> antiK* K
+411:onIfMatch = 10311 321
+### D+/- -> φ π
 411:onIfMatch = 333 211
+### D+/- -> K K π 
+411:onIfMatch = 321 321 211
+### D+/- -> f2(1270) π
+411:onIfMatch = 225 211
+### D+/- -> rho π
+411:onIfMatch = 113 211
+### D+/- -> π π π
+411:onIfMatch = 211 211 211
 
-### D_s -> K K*
-431:onIfMatch = 321 313
-### D_s -> Phi pi
+### Ds -> φ π
 431:onIfMatch = 333 211
+### Ds -> K* K
+431:onIfMatch = 313 321
+### Ds -> φ rho+
+431:onIfMatch = 333 213
+### Ds -> rho π
+431:onIfMatch = 113 211
+### Ds -> f2 π
+431:onIfMatch = 225 211
+### Ds -> π π π
+431:onIfMatch = 211 211 211
+### Ds -> K*(892)0 π+
+431:onIfMatch = 313 211
+### Ds -> f0(1370) K+
+431:onIfMatch = 10221 321
+### Ds -> rho0 K+
+431:onIfMatch = 113 321
+### Ds -> K π π
+431:onIfMatch =  321 211 211
+### Ds -> eta π+
+431:onIfMatch = 221 211
 
-### Lambda_c -> p K*
+### Λc -> pK0s
+4122:onIfMatch = 2212 311 
+### Λc -> p K- π+ π0
+4122:onIfMatch = 2212 321 211
+### Λc -> p K*
 4122:onIfMatch = 2212 313
-### Lambda_c -> Delta K
+### Λc -> Delta++ K
 4122:onIfMatch = 2224 321
-### Lambda_c -> Lambda(1520) pi
+### Λc -> Lambda(1520) π
 4122:onIfMatch = 102134 211
-### Lambda_c -> p K pi
-4122:onIfMatch = 2212 321 211
-### Lambda_c -> pK0s
-4122:onIfMatch = 2212 311 
+### Λc -> p K- π+ π0
+4122:onIfMatch = 2212 321 211 111
+### Λc -> p π π
+4122:onIfMatch = 2212 211 211
+### Λc -> p K K
+4122:onIfMatch = 2212 333
 
-### Xic+ -> pK*0
-4232:onIfMatch = 2212 313
-### Xic+ -> p K- pi+
+### Ξc+ -> p K- π+
 4232:onIfMatch = 2212 321 211
-### Xic+ -> Xi*0 pi+, Xi*->Xi- pi+
+### Ξc+ -> p antiK*0(892)
+4232:onIfMatch = 2212 313
+### Ξc+ -> p φ
+4232:onIfMatch = 2212 333
+### Ξc+ -> sigma- π+ π+
+4232:onIfMatch = 3222 211 211
+### Ξc+ -> Ξ*0 π+, Ξ*0 -> Ξ- π+
 4232:onIfMatch = 3324 211
-### Xic+ -> Xi- pi+ pi+
+### Ξc+ -> Ξ- π+ π+
 4232:onIfMatch = 3312 211 211
     
 ### Xic0 -> Xi- pi+
@@ -149,4 +291,4 @@ BeamRemnants:saturation 5
 ### Omega_c -> Omega pi
 4332:onIfMatch = 3334 211
 ### Omega_c -> Xi pi
-4332:onIfMatch = 3312 211
+4332:onIfMatch = 3312 211
\ No newline at end of file
diff --git a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_pp_ref.cfg b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_pp_ref.cfg
index 63ce139a5..00743a912 100644
--- a/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_pp_ref.cfg
+++ b/MC/config/PWGHF/pythia8/generator/pythia8_charmhadronic_with_decays_Mode2_pp_ref.cfg
@@ -42,44 +42,127 @@ BeamRemnants:saturation 5
 4332:tau0 = 0.0803
 
 ### Force golden charm hadrons decay modes for D2H studies
-### add D0 decays absent in PYTHIA8 decay table and set BRs from PDG for other
-421:oneChannel = 1 0.0389 0 -321 211
-421:addChannel = 1 0.00389 0 -321 211 111
-### add D+ decays absent in PYTHIA8 decay table and set BRs from PDG for other
-411:oneChannel = 1 0.0752 0 -321 211 211
-411:addChannel = 1 0.0104 0 -313 211
-411:addChannel = 1 0.0156 0 311 211
-411:addChannel = 1 0.0752 0 333 211 # to have the same amount of D+->KKpi and D+->Kpipi
-## add Lc decays absent in PYTHIA8 decay table and set BRs from PDG for other
-4122:oneChannel = 1 0.0196 100 2212 -313
-4122:addChannel = 1 0.0108 100 2224 -321
-4122:addChannel = 1 0.022 100 102134 211
-4122:addChannel = 1 0.035 0 2212 -321 211
-4122:addChannel = 1 0.0159 0 2212 311
-### add Xic+ decays absent in PYTHIA8 decay table
-4232:addChannel = 1 0.2 0 2212 -313
-4232:addChannel = 1 0.2 0 2212 -321 211
-4232:addChannel = 1 0.2 0 3324 211
-4232:addChannel = 1 0.2 0 3312 211 211
+# HF decays
+### BR are set to yield 50% of signal in golden channel and uniform abundance of corr. bkg channels (weighted by BR from PDG) 
+###
+### D0 decays
+### D0 -> K- π+ (50%)
+421:oneChannel = 1 0.50000 0 -321 211              ### D0 -> K- π+ 3.94% 
+### D0 -> K- π+ π0 (12.50%)
+421:addChannel = 1 0.00625 0 -321 211 111          ### D0 -> K- π+ π0 (non-resonant) 1.15% (e.g. 115/(115+231+195+1120)*0.2)
+421:addChannel = 1 0.08750 0  213 -321             ### D0 -> rho+ K- 11.2%
+421:addChannel = 1 0.01250 0 -313 111              ### D0 -> antiK*0(892) π0 1.95%
+421:addChannel = 1 0.01875 0 -323 211              ### D0 -> K*-(892) π+ 2.31%
+### D0 -> π- π+ (12.50%)
+421:addChannel = 1 0.12500 0 -211 211              ### D0 -> π- π+ (non-resonant) 1.0e-4
+### D0 -> π- π+ π0 (12.50%)
+421:addChannel = 1 0.08750 0  213 -211             ### D0 -> rho+ π- 1.01%
+421:addChannel = 1 0.03750 0 -211 211 111          ### D0 -> π- π+ π0 (non-resonant) 1.3e-4
+### D0 -> K- K+ (12.50%)
+421:addChannel = 1 0.12500 0 -321 321              ### D0 -> K- K+ (non-resonant) 4.08e-3
+
+### D+ decays
+### D+ -> K- π+ π+ (50%)
+411:oneChannel = 1 0.40189 0 -321 211 211          ### D+ -> K- π+ π+ 9.38%
+411:addChannel = 1 0.05356 0 -10311 211            ### D+ -> antiK*0(1430) π+ 1.25%
+411:addChannel = 1 0.04455 0 -313 211              ### D+ -> K*0(892) pi+ 1.04%
+### D+ -> K- π+ π+ π0 (small, 3%)
+411:addChannel = 1 0.03000 0 -321 211 211 111      ### D+ -> K- π+ π+ π0 6.25%
+### D+ -> K- K+ π+ (36.00%, set 25% for D+ -> φ π+, 11% for the rest)
+411:addChannel = 1 0.25000 0  333 211              ### D+ -> φ π+ 2.69e-3 !needed for signal
+411:addChannel = 1 0.03929 0 -313 321              ### D+ -> K*0(892) K+ 2.49e-3
+411:addChannel = 1 0.02865 0 -10311 321            ### D+ -> antiK*0(1430) K+ 1.82e-3
+411:addChannel = 1 0.04206 0 -321 321 211          ### D+ -> K- K+ π+ (non-resonant) 2.68e-3 
+### D+ -> π- π+ π+ (11.00%)
+411:addChannel = 1 0.02911 0  113 211               ### D+ -> rho0 π+ 8.4e-4
+411:addChannel = 1 0.01618 0  225 211               ### D+ -> f2(1270) π+ 4.6e-4
+411:addChannel = 1 0.06471 0 -211 211 211           ### D+ -> π- π+ π+ (non-resonant) 1.0e-4
+
+### Ds+ decays
+### Ds+ -> K- K+ π+ (50%)
+431:oneChannel = 1 0.50000 0  333 211             ### Ds+ -> φ(1020) π+ 2.21%
+431:addChannel = 1 0.15000 0 -313 321             ### Ds+ -> antiK*(892) K+ 2.58%
+### Ds+ -> K- K+ π+ π0 (small, 2%)
+431:addChannel = 1 0.02000 0  333 213              ### Ds+ -> φ(1020) rho 5.50%
+### Ds+ -> π- π+ π+ (11.00%)
+431:addChannel = 1 0.00220 0  113 211             ### Ds+ -> rho π+ 1.1e-4
+431:addChannel = 1 0.00220 0  225 211             ### Ds+ -> f2(1270) π+ 1.4e-3
+431:addChannel = 1 0.10560 0 -211 211 211         ### Ds+ -> π- π+ π+ 9.12e-3 (s-wave)
+### Ds+ -> π- K+ π+ (11.00%)
+431:addChannel = 1 0.03080 0  313 211             ### Ds+ -> K*(892)0 π+ 1.67e-3
+431:addChannel = 1 0.02200 0  10221 321           ### Ds+ -> f0(1370) K+ 1.2e-3
+431:addChannel = 1 0.03960 0  113 321             ### Ds+ -> rho0 K+ 2.17e-3
+431:addChannel = 1 0.01760 0 -211 321 211         ### Ds+ -> π- K+ π+ (non-resonant) 1.16-3
+### Ds+ -> π+ π- π+ π0 (11.00%)
+431:addChannel = 1 0.11000 0  221 211             ### Ds+ -> eta π+ -> π0 π+ π+ π- (affects D+ golden channel)
+
+## Λc decays
+### Λc+ -> p K- π+ (36%)
+4122:oneChannel = 1 0.14400 0 2212 -321 211       ### Λc+ -> p K- π+ (non-resonant) 3.5%
+4122:addChannel = 1 0.08100 100 2212 -313         ### Λc+ -> p K*0(892) 1.96%
+4122:addChannel = 1 0.04500 100 2224 -321         ### Λc+ -> Delta++ K- 1.08%
+4122:addChannel = 1 0.09000 100 102134 211        ### Λc+ -> Lambda(1520) K- 2.20e-3
+### Λc+ -> p K0S (36%)
+4122:addChannel = 1 0.36000 0 2212 311            ### Λc+ -> p K0S 1.59%
+### Λc+ -> p K- π+ π0 (small, 3%)
+4122:addChannel = 1 0.03000 0 2212 -321 211 111   ### Λc+ -> p K- π+ π0 (non-resonant) 4.6%
+### Λc+ -> p π- π+ (12.50%)
+4122:addChannel = 1 0.12500 0 2212 -211 211       ### Λc+ -> p π+ π+ 4.59%
+### Λc+ -> p K- K+ (12.50%)
+4122:addChannel = 1 0.12500 0 2212 333            ### Λc+ -> p phi 1.06%
+
+## Xic decays
+### Ξc+ -> p K- π+ (35%)
+4232:oneChannel = 1 0.17500 0 2212 -321 211        ### Ξc+ -> p K- π+ 6.18e-3
+4232:addChannel = 1 0.17500 0 2212 -313            ### Ξc+ -> p antiK*0(892)
+### Ξc+ -> Ξ- π+ π+ (35%) (set the same as Ξc+ -> p K- π+)
+4232:addChannel = 1 0.35000 0 3312 211 211        ### Ξc+ -> Ξ- π+ π+ 2.86%
+### Ξc+ -> p φ (10%)
+4232:addChannel = 1 0.10000 0 2212 333             ### Ξc+ -> p φ
+### Ξc+ -> sigma+ π+ π- (10%)
+4232:addChannel = 1 0.12500 0 3222 -211 211        ### Ξc+ -> sigma+ π- π+ 1.37%
+### Ξc+ -> Ξ*0 π+ (10%)
+4232:addChannel = 1 0.12500 0 3324 211
+
 ### add Xic0 decays absent in PYTHIA8 decay table
 4132:addChannel = 1 0.0143 0 3312 211
+
 ### add OmegaC decays absent in PYTHIA8 decay table
 4332:addChannel = 1 0.5 0 3334 211
 4332:addChannel = 1 0.5 0 3312 211
 
-### K* -> K pi
+# Allow the decay of resonances in the decay chain
+### K*0(892) -> K- π+
 313:onMode = off
 313:onIfAll = 321 211
-### for Ds -> Phi pi+
+### K*(892)+ -> K- π0
+323:onMode = off
+323:onIfAll = 321 111
+### K*(1430)0 -> K- π+
+10311:onMode = off
+10311:onIfAll = 321 211
+### rho+ -> π+ π0
+213:onMode = off
+213:onIfAll = 211 111
+### φ -> K+ K-
 333:onMode = off
 333:onIfAll = 321 321
-### for D0 -> rho0 pi+ k-
+### rho0 -> π+ π-
 113:onMode = off
 113:onIfAll = 211 211
-### for Lambda_c -> Delta++ K-
+### f2(1270) -> π+ π-
+225:onMode = off
+225:onIfAll = 211 211
+### f0(1370) -> π+ π-
+10221:onMode = off
+10221:onIfAll = 211 211
+### eta -> π+ π-
+221:onMode = off
+221:onIfAll =  111 211 211
+### for Λc -> Delta++ K-
 2224:onMode = off
 2224:onIfAll = 2212 211
-### for Lambda_c -> Lambda(1520) K-
+### for Λc -> Lambda(1520) K-
 102134:onMode = off
 102134:onIfAll = 2212 321
 ### for Xic0 -> pi Xi -> pi pi Lambda -> pi pi pi p 
@@ -92,7 +175,7 @@ BeamRemnants:saturation 5
 3334:onMode = off
 3334:onIfAll = 3122 -321
 
-### switch off all decay channels
+# switch off all decay channels
 411:onMode = off
 421:onMode = off
 431:onMode = off
@@ -102,41 +185,100 @@ BeamRemnants:saturation 5
 443:onMode = off
 4332:onMode = off
 
-### D0 -> K pi
+# Allow the decay of HF
+### D0 -> K π
 421:onIfMatch = 321 211
-### D0 -> K pi pi0
+### D0 -> K π π0
 421:onIfMatch = 321 211 111
+### D0 -> rho K
+421:onIfMatch = 213 321
+### D0 -> antiK*0 π0
+421:onIfMatch = 313 111
+### D0 -> K*- π+
+421:onIfMatch = 323 211 
+### D0 -> π π
+421:onIfMatch = 211 211
+### D0 -> rho+ π-
+421:onIfMatch = 213 -211
+### D0 -> π π π0
+421:onIfMatch = 211 211 111
+### D0 -> K K
+421:onIfMatch = 321 321
 
-### D+/- -> K pi pi 
+### D+/- -> K π π 
 411:onIfMatch = 321 211 211
-### D+/- -> K* pi
+### D+/- -> K π π 
+411:onIfMatch = 321 211 211 111
+### D+/- -> K* π
 411:onIfMatch = 313 211
-### D+/- -> phi pi
+### D+/- -> K* K
+411:onIfMatch = 313 321
+### D+/- -> antiK* π
+411:onIfMatch = 10311 211
+### D+/- -> antiK* K
+411:onIfMatch = 10311 321
+### D+/- -> φ π
 411:onIfMatch = 333 211
+### D+/- -> K K π 
+411:onIfMatch = 321 321 211
+### D+/- -> f2(1270) π
+411:onIfMatch = 225 211
+### D+/- -> rho π
+411:onIfMatch = 113 211
+### D+/- -> π π π
+411:onIfMatch = 211 211 211
 
-### D_s -> K K*
-431:onIfMatch = 321 313
-### D_s -> Phi pi
+### Ds -> φ π
 431:onIfMatch = 333 211
+### Ds -> K* K
+431:onIfMatch = 313 321
+### Ds -> φ rho+
+431:onIfMatch = 333 213
+### Ds -> rho π
+431:onIfMatch = 113 211
+### Ds -> f2 π
+431:onIfMatch = 225 211
+### Ds -> π π π
+431:onIfMatch = 211 211 211
+### Ds -> K*(892)0 π+
+431:onIfMatch = 313 211
+### Ds -> f0(1370) K+
+431:onIfMatch = 10221 321
+### Ds -> rho0 K+
+431:onIfMatch = 113 321
+### Ds -> K π π
+431:onIfMatch =  321 211 211
+### Ds -> eta π+
+431:onIfMatch = 221 211
 
-### Lambda_c -> p K*
+### Λc -> pK0s
+4122:onIfMatch = 2212 311 
+### Λc -> p K- π+ π0
+4122:onIfMatch = 2212 321 211
+### Λc -> p K*
 4122:onIfMatch = 2212 313
-### Lambda_c -> Delta K
+### Λc -> Delta++ K
 4122:onIfMatch = 2224 321
-### Lambda_c -> Lambda(1520) pi
+### Λc -> Lambda(1520) π
 4122:onIfMatch = 102134 211
-### Lambda_c -> p K pi
-4122:onIfMatch = 2212 321 211
-### Lambda_c -> pK0s
-4122:onIfMatch = 2212 311 
+### Λc -> p K- π+ π0
+4122:onIfMatch = 2212 321 211 111
+### Λc -> p π π
+4122:onIfMatch = 2212 211 211
+### Λc -> p K K
+4122:onIfMatch = 2212 333
 
-### Xic+ -> pK*0
-4232:onIfMatch = 2212 313
-### Xic+ -> p K- pi+
+### Ξc+ -> p K- π+
 4232:onIfMatch = 2212 321 211
-### Xic+ -> Xi*0 pi+, Xi*->Xi- pi+
+### Ξc+ -> p antiK*0(892)
+4232:onIfMatch = 2212 313
+### Ξc+ -> p φ
+4232:onIfMatch = 2212 333
+### Ξc+ -> sigma- π+ π+
+4232:onIfMatch = 3222 211 211
+### Ξc+ -> Ξ*0 π+, Ξ*0 -> Ξ- π+
 4232:onIfMatch = 3324 211
-### Xic+ -> Xi- pi+ pi+
+### Ξc+ -> Ξ- π+ π+
 4232:onIfMatch = 3312 211 211
     
 ### Xic0 -> Xi- pi+