diff --git a/Tests/Rivet/EE/EE-Psi2S-All.in b/Tests/Rivet/EE/EE-Psi2S-All.in
--- a/Tests/Rivet/EE/EE-Psi2S-All.in
+++ b/Tests/Rivet/EE/EE-Psi2S-All.in
@@ -1,12 +1,72 @@
# -*- ThePEG-repository -*-
# e+ e- -> psi(2S)
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPsi2S HwMELepton.so
set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S)
set /Herwig/MatrixElements/MEPsi2S:Coupling 19.25684
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.686097
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+############ general top stuff #######################
# jpsi, chi_{0,1,2} charged mults
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1800404
+########### Decay to three mesons ####################
+# psi(2s) -> J/Psi pi+pi-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1979_I144382
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I507637
+# psi(2S) -> pi+ pi- pi0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1088606
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_2005_I689969
+# psi(2S) -> omega KS0 KS0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1921801
+# psi(2S) -> K+ K- pi0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1127328
+# psi(2S) -> K+ K- eta
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1771616
+# psi(2S) -> pi+ pi- eta'
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1621266
+
+########### Decay to 2 baryons + meson ####################
+# psi(2S) -> p pbar eta'
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1709205
+# psi(2S) -> p pbar eta
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1227512
+# psi(2S) -> p pbar pi0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1120737
+# psi(2S) -> p pbar phi
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1722111
+# psi(2S) -> Lambda Lambdabar omega
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2122392
+# psi(2S) -> Lambda Lambdabar eta
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2128095
+# psi(2S) -> p nbar pi- +cc
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2006_I716589
+########### Decay to gamma chi_c correlations ###########
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1507887
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2009_I832707
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1624548
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2011_I931195
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2033855
+########### chi_c Decays ################################
+# decays to baryon antibaryon meson
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1818254
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1870388
+# chi_c1 pi+pi-eta + other modes
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I732065
+# chi_c1 pi+pi-eta
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1490896
+# chi_c1 pi+pi-eta(')
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2011_I929693
+# chi_c to phi phi eta
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1763897
+# chi_c to 4 KS0
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1716627
+# chi_c(1,2) -> J/psi mu+mu-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1716256
+# chi_c(1,2) -> eta' K+ K-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2014_I1280710
+# chi_c 4 pi 2K 2pi
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2008_I787608
+# chi_c0 pi+pi-K+K-
+insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2005_I690784
diff --git a/Tests/Rivet/EE/EE-Psi2S.in b/Tests/Rivet/EE/EE-Psi2S.in
--- a/Tests/Rivet/EE/EE-Psi2S.in
+++ b/Tests/Rivet/EE/EE-Psi2S.in
@@ -1,85 +1,29 @@
# -*- ThePEG-repository -*-
# e+ e- -> psi(2S)
create Herwig::MEee2VectorMeson /Herwig/MatrixElements/MEPsi2S HwMELepton.so
set /Herwig/MatrixElements/MEPsi2S:VectorMeson /Herwig/Particles/psi(2S)
set /Herwig/MatrixElements/MEPsi2S:Coupling 19.25684
set /Herwig/MatrixElements/SubProcess:MatrixElements 0 /Herwig/MatrixElements/MEPsi2S
set EventGenerator:EventHandler:LuminosityFunction:Energy 3.686097
set /Herwig/Generators/EventGenerator:EventHandler:Cuts:MHatMin 0.2
set /Herwig/Particles/e-:PDF /Herwig/Partons/NoPDF
set /Herwig/Particles/e+:PDF /Herwig/Partons/NoPDF
+do /Herwig/Particles/psi(2S):SelectDecayModes psi(2S)->n0,nbar0; psi(2S)->p+,pbar-; psi(2S)->Sigma0,Sigmabar0; psi(2S)->Sigma+,Sigmabar-; psi(2S)->Lambda0,Lambdabar0; psi(2S)->Sigma*-,Sigma*bar+; psi(2S)->Sigma*0,Sigma*bar0; psi(2S)->Sigma*+,Sigma*bar-; psi(2S)->Xi-,Xibar+; psi(2S)->Xi0,Xibar0; psi(2S)->Sigma*0,Sigma*bar0; psi(2S)->Xi*-,Xi*bar+; psi(2S)->Xi*0,Xi*bar0;
########### Decay to two baryons (correlations) ####################
# psi(2S) -> lambda anti-lambda and sigma anti-sigma
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1510563
# psi(2S) -> p pbar and n nbar
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2018_I1658762
# psi(2S) -> xi- and Sigma+/-
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2016_I1422780
# psi(2S) -> xi0 and Sigma*0
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1506414
# psi(2S) -> xi*-
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1747092
# psi(2S) -> xi*0
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1921775
# BES psi(2s) -> sigma+ sigmabar-
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1791570
# psi(2S) -> xi- xi+bar correlations
insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2099144
-########### Decay to three mesons ####################
-# psi(2s) -> J/Psi pi+pi-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 MARKII_1979_I144382
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_1999_I507637
-# psi(2S) -> pi+ pi- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1088606
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BES_2005_I689969
-# psi(2S) -> omega KS0 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1921801
-# psi(2S) -> K+ K- pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2012_I1127328
-# psi(2S) -> K+ K- eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1771616
-########### Decay to 2 baryons + meson ####################
-# psi(2S) -> pi+ pi- eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1621266
-# psi(2S) -> p pbar eta'
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1709205
-# psi(2S) -> p pbar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1227512
-# psi(2S) -> p pbar pi0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2013_I1120737
-# psi(2S) -> p pbar phi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1722111
-# psi(2S) -> Lambda Lambdabar omega
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2122392
-# psi(2S) -> Lambda Lambdabar eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2128095
-# psi(2S) -> p nbar pi- +cc
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2006_I716589
-########### Decay to gamma chi_c correlations ###########
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1507887
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2009_I832707
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1624548
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2011_I931195
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2022_I2033855
-########### chi_c Decays ################################
-# decays to baryon antibaryon meson
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1818254
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2021_I1870388
-# chi_c1 pi+pi-eta + other modes
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2007_I732065
-# chi_c1 pi+pi-eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2017_I1490896
-# chi_c1 pi+pi-eta(')
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEOC_2011_I929693
-# chi_c to phi phi eta
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2020_I1763897
-# chi_c to 4 KS0
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1716627
-# chi_c(1,2) -> J/psi mu+mu-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2019_I1716256
-# chi_c(1,2) -> eta' K+ K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESIII_2014_I1280710
-# chi_c 4 pi 2K 2pi
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 CLEO_2008_I787608
-# chi_c0 pi+pi-K+K-
-insert /Herwig/Analysis/RivetAnalysis:Analyses 0 BESII_2005_I690784
+
diff --git a/src/LEP.in b/src/LEP.in
--- a/src/LEP.in
+++ b/src/LEP.in
@@ -1,75 +1,113 @@
# -*- ThePEG-repository -*-
##################################################
# Example generator based on LEP parameters
# usage: Herwig read LEP.in
##################################################
read snippets/EECollider.in
##################################################
# Change settings for the ee->Z->qq matrix element
# to avoid producing top quarks
#
# 'set' lines like this can be omitted if the
# default value is already okay.
#
# Any repository setting can be modified here
##################################################
##################################################
# Selected the hard process
##################################################
# leading-order processes
##################################################
cd /Herwig/MatrixElements
# default e+e- > q qbar (5 flavours d,u,s,c,b)
insert SubProcess:MatrixElements 0 MEee2gZ2qq
# e+e- > l+l-
# insert SubProcess:MatrixElements[0] MEee2gZ2ll
# e+e- > W+W- ZZ
# insert SubProcess:MatrixElements[0] MEee2VV
# higgs+Z
# insert SubProcess:MatrixElements[0] MEee2ZH
# higgs+e+e-/nu_enu_ebar via VBF
# insert SubProcess:MatrixElements[0] MEee2HiggsVBF
##################################################
# NLO powheg processes
##################################################
#set /Herwig/Shower/ShowerHandler:HardEmission POWHEG
#insert SubProcess:MatrixElements 0 PowhegMEee2gZ2qq
#insert SubProcess:MatrixElements 0 PowhegMEee2gZ2ll
##################################################
# LEP physics parameters (override defaults)
##################################################
cd /Herwig/Generators
set EventGenerator:EventHandler:LuminosityFunction:Energy 91.2
##################################################
## prepare for Rivet analysis or HepMC output
## when running with parton shower
##################################################
#read snippets/Rivet.in
#insert /Herwig/Analysis/Rivet:Analyses 0 XXX_2015_ABC123
#read snippets/HepMC.in
#set /Herwig/Analysis/HepMC:PrintEvent NNN
-set /Herwig/Decays/BottomMeson:Initialize 1
-set /Herwig/Decays/BottomMeson:DatabaseOutput 1
-set /Herwig/Decays/BottomMeson:Points 100000
+#set /Herwig/Decays/TVV:Initialize 1
+#set /Herwig/Decays/TVV:DatabaseOutput 1
+#set /Herwig/Decays/TVV:Points 100000
+#set /Herwig/Decays/SVV:Initialize 1
+#set /Herwig/Decays/SVV:DatabaseOutput 1
+#set /Herwig/Decays/SVV:Points 100000
+# set /Herwig/Decays/ScalarSS:Initialize 1
+# set /Herwig/Decays/ScalarSS:DatabaseOutput 1
+# set /Herwig/Decays/ScalarSS:Points 100000
+# set /Herwig/Decays/AVV:Initialize 1
+# set /Herwig/Decays/AVV:DatabaseOutput 1
+# set /Herwig/Decays/AVV:Points 100000
+# set /Herwig/Decays/SFF:Initialize 1
+# set /Herwig/Decays/SFF:DatabaseOutput 1
+# set /Herwig/Decays/SFF:Points 100000
+#set /Herwig/Decays/TTP:Initialize 1
+#set /Herwig/Decays/TTP:DatabaseOutput 1
+#set /Herwig/Decays/TTP:Points 100000
+# set /Herwig/Decays/Tensor2PScalar:Initialize 1
+# set /Herwig/Decays/Tensor2PScalar:DatabaseOutput 1
+# set /Herwig/Decays/Tensor2PScalar:Points 100000
+#set /Herwig/Decays/TensorVP:Initialize 1
+#set /Herwig/Decays/TensorVP:DatabaseOutput 1
+#set /Herwig/Decays/TensorVP:Points 100000
+
+set /Herwig/Widths/psi2Swidth:Initialize 1
+set /Herwig/Widths/psi2Swidth:Output 1
+set /Herwig/Masses/psi2smass:Initialize 1
+set /Herwig/Masses/psi2smass:Output 1
+set /Herwig/Widths/chi_c01Pwidth:Initialize 1
+set /Herwig/Widths/chi_c01Pwidth:Output 1
+set /Herwig/Masses/chi_c0mass:Initialize 1
+set /Herwig/Masses/chi_c0mass:Output 1
+set /Herwig/Widths/chi_c11Pwidth:Initialize 1
+set /Herwig/Widths/chi_c11Pwidth:Output 1
+set /Herwig/Masses/chi_c11Pmass:Initialize 1
+set /Herwig/Masses/chi_c11Pmass:Output 1
+set /Herwig/Widths/chi_c21Pwidth:Initialize 1
+set /Herwig/Widths/chi_c21Pwidth:Output 1
+set /Herwig/Masses/chi_c21Pmass:Initialize 1
+set /Herwig/Masses/chi_c21Pmass:Output 1
###################################################
# Save run for later usage with 'Herwig run'
##################################################
saverun LEP EventGenerator
##################################################
# uncomment this section for an example batch run
# of two repeats with different parameters
#
# Note that a separate call of 'Herwig run'
# is not required
##################################################
# set EventGenerator:NumberOfEvents 100
# run LEP-Zpole EventGenerator
# set EventGenerator:EventHandler:LuminosityFunction:Energy 208.0
# run LEP-maxE EventGenerator