diff --git a/dkfiles/Bd_DD,DD=cocktail,D+muRDplusCut.dec b/dkfiles/Bd_DD,DD=cocktail,D+muRDplusCutFixed.dec
similarity index 84%
rename from dkfiles/Bd_DD,DD=cocktail,D+muRDplusCut.dec
rename to dkfiles/Bd_DD,DD=cocktail,D+muRDplusCutFixed.dec
index c4276dcde84c11cd411ae8355ff90352b954f672..2e6dc3d46d78957c86b959e34882a8e0df258cde 100644
--- a/dkfiles/Bd_DD,DD=cocktail,D+muRDplusCut.dec
+++ b/dkfiles/Bd_DD,DD=cocktail,D+muRDplusCutFixed.dec
@@ -1,8 +1,8 @@
-# EventType: 11995204
+# EventType: 11694605
 #
 # Descriptor: [[B0] ==> (D*- -> (D~0 -> K+ mu- nu_mu~)) (D_s*+ -> gamma (D_s+ -> K+ K- pi+))]cc
 #
-# NickName: Bd_DD,DD=cocktail,D+muRDplusCut
+# NickName: Bd_DD,DD=cocktail,D+muRDplusCutFixed
 # Cuts: LoKi::GenCutTool/TightCut
 #
 # InsertPythonCode:
@@ -12,7 +12,7 @@
 # gen = Generation()
 # gen.SignalRepeatedHadronization.addTool ( LoKi__GenCutTool , 'TightCut' )
 # tightCut = gen.SignalRepeatedHadronization.TightCut
-# tightCut.Decay = "[B0 ==> ((Charm) -> ^mu+ nu_mu ... ) ^(D- -> ^K+ ^pi- ^pi-) {X} {X} {X} {X} {X} {X} {X} ]CC"
+# tightCut.Decay = "[(Beauty) ==> ((Charm) ==> ^mu+ nu_mu {X} {X} {X} {X} ) ^(D- ==> ^K+ ^pi- ^pi-) {X} {X} {X} {X} {X} {X} {X} ]CC"
 #tightCut.Preambulo += [
 #  "from LoKiCore.functions import in_range"  ,
 #  "from GaudiKernel.SystemOfUnits import GeV, MeV"  ,
@@ -20,9 +20,9 @@
 #  "pipiKPT     = GCHILD(GPT,1) + GCHILD(GPT,2) + GCHILD(GPT,3)" ,
 #]
 #tightCut.Cuts      =    {
-# '[pi+]cc'   : " in_range( 0.010 , GTHETA , 0.400 )& ( GPT > 150 * MeV )" ,
-# '[K-]cc'   : " in_range( 0.010 , GTHETA , 0.400 ) & ( GPT > 150 * MeV )" ,
-# '[mu+]cc'  : " in_range( 0.010 , GTHETA , 0.400 ) & (GP > 2500* MeV) ",
+# '[pi+]cc'   : "in_range( 0.010 , GTHETA , 0.400 )& ( GPT > 150 * MeV )" ,
+# '[K-]cc'   : "in_range( 0.010 , GTHETA , 0.400 ) & ( GPT > 150 * MeV )" ,
+# '[mu+]cc'  : "in_range( 0.010 , GTHETA , 0.400 ) & (GP > 2500* MeV)",
 # '[D+]cc'   : "( pipiKP > 15000 * MeV ) & (pipiKPT > 2300 * MeV)"
 #    }
 # EndInsertPythonCode
@@ -37,7 +37,7 @@
 # Tested: Yes
 # Responsible: Patrick Owen
 # Email: patrick.haworth.owen@gmail.com
-# Date:   20160802
+# Date:   20230712
 #
 Alias        MyD0		D0
 Alias        MyAntiD0    	anti-D0
@@ -138,8 +138,8 @@ ChargeConj   MyD'_1+		MyD'_1-
 Decay B0sig
  0.00720      MyD-	MyD_s+			PHSP;
  0.00740      MyD_s*+	MyD-			SVS;
- 0.00800      MyD*-	MyD_s+			SVS;
- 0.01770      MyD*-	MyD_s*+			SVV_HELAMP 0.4904 0.0 0.7204 0.0 0.4904 0.0;
+ 0.00250      MyD*-	MyD_s+			SVS;
+ 0.00570      MyD*-	MyD_s*+			SVV_HELAMP 0.4904 0.0 0.7204 0.0 0.4904 0.0;
  0.00060      MyD'_1-	MyD_s+			SVS;
  0.00120      MyD'_1-	MyD_s*+			SVV_HELAMP 0.48 0.0 0.734 0.0 0.48 0.0;
  0.00120      MyD_1-	MyD_s+			SVS;
@@ -149,48 +149,44 @@ Decay B0sig
 
  0.00160	      MyD-	MySLD+	K0		PHSP;
  0.00110	      MySLD*-	MyD+	K0		PHSP;
- 0.00110	      MyD*-	MySLD+	K0		PHSP;
- 0.00190	      MySLD-	MyD*+	K0		PHSP;
+ 0.00040	      MyD*-	MySLD+	K0		PHSP;
+ 0.00070	      MySLD-	MyD*+	K0		PHSP;
  0.00190	      MyD-	MySLD*+	K0		PHSP;
- 0.00920	      MyD*-	MySLD*+   K0		PHSP;
+ 0.00320	      MyD*-	MySLD*+   K0		PHSP;
  0.00150	      MyD-	MyD0	K+		PHSP;
  0.00630	      MyD-	MyD*0	K+		PHSP;
- 0.00230	      MyD*-	MyD0	K+		PHSP;
- 0.01120	      MyD*-	MyD*0	K+		PHSP;
+ 0.00070	      MyD*-	MyD0	K+		PHSP;
+ 0.00420	      MyD*-	MyD*0	K+		PHSP;
 
  0.00250	      MyD-	MyD0	K*+		PHSP;
- 0.00250	      MyD*-	MyD0	K*+		PHSP;
+ 0.00080	      MyD*-	MyD0	K*+		PHSP;
  0.00250	      MyD-	MyD*0	K*+		PHSP;
- 0.00500	      MyD*-	MyD*0	K*+		PHSP;
+ 0.00150	      MyD*-	MyD*0	K*+		PHSP;
 
  0.00250	      MyD-	MySLD+	K*0		PHSP;
- 0.00250	      MySLD-	MyD*+	K*0		PHSP;
- 0.00250	      MyD*-	MySLD+	K*0		PHSP;
- 0.00500	      MySLD*-	MyD*+	K*0		PHSP;
+ 0.00080	      MySLD-	MyD*+	K*0		PHSP;
+ 0.00080	      MyD*-	MySLD+	K*0		PHSP;
+ 0.00150	      MySLD*-	MyD*+	K*0		PHSP;
 
  0.00180       	MyD_s+	MyD-	pi0		PHSP;
- 0.00370	      MyD_s+	MyAntiD0   pi-		PHSP;
  0.00180	      MyD_s*+ 	MyD-	   pi0		PHSP;
- 0.00370   	      MyD_s*+	MyAntiD0   pi-		PHSP;
  0.00300      	      MyD_s+	MyD-	   pi-   pi+	PHSP;
  0.00220      	      MyD_s+	MyD-	   pi0	 pi0	PHSP;
- 0.00220      	      MyD_s+	MyAntiD0   pi-	 pi0	PHSP;
  0.00300      	      MyD_s*+	MyD-	   pi-	 pi+	PHSP;
  0.00220      	      MyD_s*+	MyD-	   pi0	 pi0	PHSP;
- 0.00220      	      MyD_s*+	MyAntiD0   pi-	 pi0	PHSP;
 
  0.000211	      MyD-	MySLD+			PHSP;
  0.000200	      MySLD*-	MyD+			SVS;
- 0.000600	      MyD*+	MySLD-			SVS;
- 0.000800	      MySLD*-	MyD*+			SVV_HELAMP 0.4904 0.0 0.7204 0.0 0.4904 0.0;
+ 0.000200	      MyD*+	MySLD-			SVS;
+ 0.000240	      MySLD*-	MyD*+			SVV_HELAMP 0.4904 0.0 0.7204 0.0 0.4904 0.0;
 	      
  0.00075              MyD-      MyD_s0*+        PHSP;
- 0.00090              MyD*-     MyD_s0*+        SVS;
+ 0.00030              MyD*-     MyD_s0*+        SVS;
  0.00310              MyD_s1+	MyD-		SVS;
- 0.01200              MyD*-     MyD_s1+         SVV_HELAMP 0.4904 0. 0.7204 0. 0.4904 0.0;
+ 0.00400              MyD*-     MyD_s1+         SVV_HELAMP 0.4904 0. 0.7204 0. 0.4904 0.0;
 	      
  0.00045              MyD-      MyD'_s1+        PHSP;
- 0.00094              MyD*-     MyD'_s1+        PHSP;
+ 0.00034              MyD*-     MyD'_s1+        PHSP;
 Enddecay
 CDecay anti-B0sig
 #
@@ -235,7 +231,6 @@ Enddecay
 CDecay MyD'_1+
 #
 Decay MyD*+
- 0.67700        MyD0    pi+             VSS;
  0.30700        MyD+    pi0             VSS;
  0.01600        MyD+    gamma           VSP_PWAVE;
 Enddecay
diff --git a/dkfiles/Bu_DD,DD=cocktail,D+muRDplusCut.dec b/dkfiles/Bu_DD,DD=cocktail,D+muRDplusCutFixed.dec
similarity index 84%
rename from dkfiles/Bu_DD,DD=cocktail,D+muRDplusCut.dec
rename to dkfiles/Bu_DD,DD=cocktail,D+muRDplusCutFixed.dec
index 10cc752f03ad3e2a1e5564078e6629147324c384..4755ce7fc8f8d36685862e7eee170ddb56ea8a51 100644
--- a/dkfiles/Bu_DD,DD=cocktail,D+muRDplusCut.dec
+++ b/dkfiles/Bu_DD,DD=cocktail,D+muRDplusCutFixed.dec
@@ -1,8 +1,8 @@
-# EventType: 12995604
+# EventType: 12695405
 #
 # Descriptor: [[B+] ==> (D*(2007)~0 -> (D~0 -> K+ mu- nu_mu~) pi0) (D_s*+ -> (D_s+ -> K+ K- pi+) gamma)]cc
 #
-# NickName: Bu_DD,DD=cocktail,D+muRDplusCut
+# NickName: Bu_DD,DD=cocktail,D+muRDplusCutFixed
 # Cuts: LoKi::GenCutTool/TightCut
 #
 # InsertPythonCode:
@@ -12,19 +12,19 @@
 # gen = Generation()
 # gen.SignalRepeatedHadronization.addTool ( LoKi__GenCutTool , 'TightCut' )
 # tightCut = gen.SignalRepeatedHadronization.TightCut
-# tightCut.Decay = "[B+ ==> ^((Charm) -> ^mu+ nu_mu ... ) ^(D- -> ^K+ ^pi- ^pi- ) {X} {X} {X} {X} {X} {X} {X} ]CC"
-# tightCut.Preambulo += [
-# "from GaudiKernel.SystemOfUnits import mrad" ,
-# "FilterD = GNINTREE (GCHARM, HepMC.parents)",
-# "FromD   = 1 == FilterD",
-# "BCut = (GTHETA < 400.0*mrad)"
-#
+# tightCut.Decay = "[(Beauty) ==> ((Charm) ==> ^mu+ nu_mu {X} {X} {X} {X} ) ^(D- ==> ^K+ ^pi- ^pi- ) {X} {X} {X} {X} {X} {X} {X} ]CC"
+#tightCut.Preambulo += [
+#  "from LoKiCore.functions import in_range"  ,
+#  "from GaudiKernel.SystemOfUnits import GeV, MeV"  ,
+#  "pipiKP     = GCHILD(GP,1) + GCHILD(GP,2) + GCHILD(GP,3)" ,
+#  "pipiKPT     = GCHILD(GPT,1) + GCHILD(GPT,2) + GCHILD(GPT,3)" ,
 #]
-#tightCut.Cuts    =    {
-# '[mu+]cc'     : "FromD",
-# '[B+]cc'	: "BCut"
-#}
-#
+#tightCut.Cuts      =    {
+# '[pi+]cc'   : "in_range( 0.010 , GTHETA , 0.400 )& ( GPT > 150 * MeV )" ,
+# '[K-]cc'   : "in_range( 0.010 , GTHETA , 0.400 ) & ( GPT > 150 * MeV )" ,
+# '[mu+]cc'  : "in_range( 0.010 , GTHETA , 0.400 ) & (GP > 2500* MeV)",
+# '[D+]cc'   : "( pipiKP > 15000 * MeV ) & (pipiKPT > 2300 * MeV)"
+#    }
 # EndInsertPythonCode
 #
 # Documentation: Sum of B+ decaying to two D mesons, one D decaying semileptonically. Filtered for a final state with D+mu.
@@ -37,7 +37,7 @@
 # Tested: Yes
 # Responsible: Patrick Owen
 # Email: patrick.haworth.owen@gmail.com
-# Date:   20160803
+# Date:   20230712
 #
 Alias        MyD0		D0
 Alias        MyAntiD0    	anti-D0
@@ -136,10 +136,6 @@ Alias	     MyD'_1-		D'_1-
 ChargeConj   MyD'_1+		MyD'_1-
 #
 Decay B+sig
- 0.00900      MyAntiD0		MyD_s+			PHSP;
- 0.00760      MyD_s*+		MyAntiD0		SVS;
- 0.00820      MyAntiD*0		MyD_s+			SVS;
- 0.01710      MyAntiD*0		MyD_s*+			SVV_HELAMP 0.48 0.0 0.734 0.0 0.48 0.0;
  0.00120      MyAntiD'_10	MyD_s+			SVS;
  0.00240      MyAntiD'_10	MyD_s*+			SVV_HELAMP 0.48 0.0 0.734 0.0 0.48 0.0;
  0.00240      MyAntiD_10	MyD_s+			SVS;
@@ -148,15 +144,14 @@ Decay B+sig
  0.00800      MyAntiD_2*0	MyD_s*+			PHSP;
 
  0.00160      MyAntiD0		MyD+	K0	PHSP;
- 0.00380      MyAntiD0		MyD*+	K0	PHSP;
+ 0.00140      MyAntiD0		MyD*+	K0	PHSP;
  0.00210      MyAntiD*0		MyD+	K0	PHSP;
- 0.00920      MyAntiD*0		MyD*+	K0	PHSP;
+ 0.00320      MyAntiD*0		MyD*+	K0	PHSP;
 
  0.00250      MyAntiD0		MyD+	K*0		PHSP;
- 0.00250      MyAntiD0		MyD*+	K*0		PHSP;
+ 0.00080      MyAntiD0		MyD*+	K*0		PHSP;
  0.00250      MyAntiD*0		MyD+	K*0		PHSP;
- 0.00500      MyAntiD*0		MyD*+	K*0		PHSP;
-
+ 0.00150      MyAntiD*0		MyD*+	K*0		PHSP;
  0.00360      MyD_s+	MyD-		pi+		PHSP;
  0.00370      MyD_s*+ 	MyD- 	    	pi+		PHSP;
 
@@ -165,19 +160,19 @@ Decay B+sig
 
  0.000400      MyAntiD0		MyD+			PHSP;
  0.000600      MyAntiD*0	MyD+			SVS;
- 0.000400      MyD*+		MyAntiD0		SVS;
- 0.000800      MyAntiD*0	MyD*+			SVV_HELAMP 0.283 0.0 0.932 0.0 0.228 0.0;
+ 0.000150      MyD*+		MyAntiD0		SVS;
+ 0.000250      MyAntiD*0	MyD*+			SVV_HELAMP 0.283 0.0 0.932 0.0 0.228 0.0;
 
 
- 0.00020	MySLD-	MyD+	K+	PHSP;
- 0.00060	MyD-	MySLD*+	K+	PHSP;
- 0.00060	MySLD*-	MyD+	K+	PHSP;
- 0.00130	MyD*-	MySLD*+	K+	PHSP;
+ 0.00160	MySLD-	MyD+	K+	PHSP;
+ 0.00380	MyD-	MySLD*+	K+	PHSP;
+ 0.00210	MySLD*-	MyD+	K+	PHSP;
+ 0.00320	MyD*-	MySLD*+	K+	PHSP;
 
- 0.00050	MySLD-	MyD+	K*+	PHSP;
- 0.00050	MyD-	MySLD*+	K*+	PHSP;
- 0.00050	MySLD*-	MyD+	K*+	PHSP;
- 0.00100	MyD*-	MySLD*+	K*+	PHSP;      
+ 0.00250	MySLD-	MyD+	K*+	PHSP;
+ 0.00250	MyD-	MySLD*+	K*+	PHSP;
+ 0.00250	MySLD*-	MyD+	K*+	PHSP;
+ 0.00150	MyD*-	MySLD*+	K*+	PHSP;      
 Enddecay
 CDecay B-sig
 #
@@ -222,7 +217,6 @@ Enddecay
 CDecay MyD'_1+
 #
 Decay MyD*+
- 0.67700        MyD0    pi+             VSS;
  0.30700        MyD+    pi0             VSS;
  0.01600        MyD+    gamma           VSP_PWAVE;
 Enddecay
diff --git a/doc/table_obsolete.sql b/doc/table_obsolete.sql
index 63d48e3389e7cdc6672489f30601dc91bea2a7dd..630e64a5d10a07ea25e1b10a2fc589213c029822 100644
--- a/doc/table_obsolete.sql
+++ b/doc/table_obsolete.sql
@@ -405,3 +405,5 @@ EVTTYPEID = 39122249, DESCRIPTION = "pi0_gammaA,ee,displaced,mA=20MeV,badlifetim
 EVTTYPEID = 39122940, DESCRIPTION = "pi0_gammaA,ee,displaced,mA=50MeV,badlifetime", PRIMARY = "[eta -> gamma (A' -> e+ e-)]"
 EVTTYPEID = 39122246, DESCRIPTION = "pi0_gammaA,ee,displaced,mA=5MeV,badlifetime", PRIMARY = "[eta -> gamma (A' -> e+ e-)]"
 EVTTYPEID = 12513011, DESCRIPTION = "Bu_phimunu=TightCut,BToVlnuBall,buggy", PRIMARY = "[B+ -> (phi(1020) -> K+ K-) mu+ nu_mu]cc"
+EVTTYPEID = 11995204, DESCRIPTION = "Bd_DD,DD=cocktail,D+muRDplusCut", PRIMARY = "[B0 -> (D- -> K+ pi- pi) D_s+]cc"
+EVTTYPEID = 12995604, DESCRIPTION = "Bu_DD,DD=cocktail,D+muRDplusCut", PRIMARY = "[B+ -> (D- -> K+ pi- pi) D_s+ K+]cc"