diff --git a/DBASE/COIN/STD/standard.kinematics b/DBASE/COIN/STD/standard.kinematics
index bf059256cfd5904257db6492b9fe218316d41c1d..2db0ae871dc1651ea7969ddee806afe5bd3c8a2b 100644
--- a/DBASE/COIN/STD/standard.kinematics
+++ b/DBASE/COIN/STD/standard.kinematics
@@ -7,7 +7,7 @@
 #
 
 0-99999
-gpbeam = 6.4
+gpbeam = 6.430
 gtargmass_amu=12.0107
 htheta_lab = -15.
 ptheta_lab = 15.
@@ -85,7 +85,7 @@ gtargmass_amu = 26.98
 gtargmass_amu = 1.00794
 
 1851-1867
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -27.5
 ptheta_lab = 27.6
@@ -95,7 +95,7 @@ hpartmass = 0.93827231
 ppartmass = 0.00051099
 
 1884-1892
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -20.0
 ptheta_lab = 20.0
@@ -105,7 +105,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 1893-1901
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -27.54
 ptheta_lab = 27.50
@@ -115,7 +115,7 @@ hpartmass = 0.93827231
 ppartmass = 0.00051099
 
 1902-1903
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -27.54
 ptheta_lab = 27.50
@@ -126,7 +126,7 @@ ppartmass = 0.00051099
 
 
 1904-1905
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -22.0
 ptheta_lab = 22.0
@@ -137,7 +137,7 @@ ppartmass = 0.00051099
 
 
 1906-1918
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -25.01
 ptheta_lab = 30.08
@@ -148,7 +148,7 @@ ppartmass = 0.00051099
 
 
 1919
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -22.01
 ptheta_lab = 22.06
@@ -158,7 +158,7 @@ hpartmass = 0.93827231
 ppartmass = 0.00051099
 
 1920
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -22.01
 ptheta_lab = 33.06
@@ -171,7 +171,7 @@ hpartmass = 0.00051099
 junk run
 
 1927
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -22.01
 ptheta_lab = 33.07
@@ -182,7 +182,7 @@ hpartmass = 0.00051099
 
 
 1928
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -35.0
 ptheta_lab = 22.05
@@ -192,7 +192,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 1929
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -35.0
 ptheta_lab = 22.04
@@ -217,8 +217,7 @@ EDTM Run
 Junk Run
 
 1951 - 1952
-gpbeam = 6.405
-gtarggpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -50.0
 ptheta_lab = 15.03
@@ -237,7 +236,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2022 - 2024
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -45.1
 ptheta_lab = 17.1
@@ -247,7 +246,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2042
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -15.02
 ptheta_lab = 17.09
@@ -257,7 +256,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2043-2044
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu =  26.98
 htheta_lab = -15.02
 ptheta_lab = 17.12
@@ -267,7 +266,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2045-2054
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794 
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -277,7 +276,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2055
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 26.98 
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -287,7 +286,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2056-2057
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -297,7 +296,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2058-2060
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -307,7 +306,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2061-2065
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 12.0107
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -317,7 +316,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2066
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 1.00794
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -327,7 +326,7 @@ ppartmass = 0.93827231
 hpartmass = 0.00051099
 
 2067-2068
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu = 26.98
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -338,7 +337,7 @@ hpartmass = 0.0005109
 
 #Carbon Hole, Jan 26 2018
 2081-2185
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu =  12.0107
 htheta_lab = -45.11
 ptheta_lab = 17.12
@@ -349,7 +348,7 @@ hpartmass = 0.0005109
 
 #Ct Experiment (E12-06-107)
 2186-2277
-gpbeam = 6.405
+gpbeam = 6.430
 gtargmass_amu =  12.0107
 htheta_lab = -45.145
 ptheta_lab = 17.11
diff --git a/DBASE/SHMS/STD/standard.kinematics b/DBASE/SHMS/STD/standard.kinematics
index 08bd2e2fffa86582b4db7bb5da4d18613f08066b..b36f5d25f8fbda512aad54f365a2f8e51826a42d 100644
--- a/DBASE/SHMS/STD/standard.kinematics
+++ b/DBASE/SHMS/STD/standard.kinematics
@@ -8,7 +8,7 @@
 # 1722 is last December commissioning run
 
 0-1722
-gpbeam = 2.218
+gpbeam = 2.221
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 25.02
@@ -110,28 +110,28 @@ ppcentral = 2.50971
 
 
 1754-1778
-gpbeam = 6.418
+gpbeam = 6.430
 gtargmass_amu=1.00794
 ppartmass = 0.00051099
 ptheta_lab = 15.0
 ppcentral = 3.0
 
 1781-1783
-gpbeam = 6.418
+gpbeam = 6.430
 gtargmass_amu=1.00794
 ppartmass = 0.00051099
 ptheta_lab = 25.015
 ppcentral = 3.0
 
 1784-1788
-gpbeam = 6.418
+gpbeam = 6.430
 gtargmass_amu=1.00794
 ppartmass = 0.00051099
 ptheta_lab = 25.015
 ppcentral = 1.4
 
 1789
-gpbeam = 6.418
+gpbeam = 6.430
 gtargmass_amu=2.014101
 ppartmass = 0.00051099
 ptheta_lab = 25.015
@@ -139,21 +139,21 @@ ppcentral = 1.4cd ..
 
 # Q2 defocussed tune
 1791
-gpbeam = 6.418
+gpbeam = 6.430
 gtargmass_amu=1.00794
 ppartmass = 0.00051099
 ptheta_lab = 25.015
 ppcentral = 3.0
 
 1793
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=1.00794
 ppartmass = 0.00051099
 ptheta_lab = 8.015
 ppcentral = 6.017
 
 1795
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 8.015
@@ -162,7 +162,7 @@ ppcentral = 6.017
 #SIEVE Slit
 
 1796-1804
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 8.01
@@ -171,21 +171,21 @@ ppcentral = 5.0
 #HMS/SHMS Angle and Position Matrix Optimization 
 
 1805-1806
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 15.0
 ppcentral = 3.5
 
 1807
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 15
 ppcentral = 3.5
 
 1808-1812
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 15.0
@@ -194,7 +194,7 @@ ppcentral = 4.0
 
 
 1813-1814 
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu=12.0107
 ppartmass = 0.00051099
 ptheta_lab = 22.045
@@ -203,21 +203,21 @@ ppcentral = 3.2
 #Run Plan: Large Ytar: HMS/SHMS Angel and position Matrix Optimization (01/15/18)
 
 1815-1823
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 12.0107
 ppartmass =  0.00051099
 ptheta_lab =30.065
 ppcentral = 2.0
 
 1824-1828
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.035
 ppcentral = 3.0
 
 1829-1842
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.035
@@ -225,42 +225,42 @@ ppcentral = 1.4
 
 
 1843-1849
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.035
 ppcentral = 3.0
 
 1966-1969
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =15.0
 ppcentral = 3.0
 
 1970-1979
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 2.014101
 ppartmass =  0.00051099
 ptheta_lab =15.0
 ppcentral = 3.0
 
 1980-1991
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 2.014101
 ppartmass =  0.00051099
 ptheta_lab =15.0
 ppcentral = 3.0
 
 1992-2000
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 12.0107
 ppartmass =  0.00051099
 ptheta_lab =15.0
 ppcentral = 3.0
 
 2001-2013
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 26.98
 ppartmass =  0.00051099
 ptheta_lab =15.0
@@ -268,105 +268,105 @@ ppcentral = 3.0
 
 
 2014-2020
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 26.98
 ppartmass =  0.00051099
 ptheta_lab =17.0
 ppcentral = 5.112
 
 2071-2072
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =16.02
 ppcentral = 5.074
 
 2074
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =20.03
 ppcentral = 4.522
 
 2075-2077
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.02
 ppcentral = 3.0
 
 2078-2081
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.02
 ppcentral = 1.4
 
 2082-2084
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 12.0107
 ppartmass =  0.00051099
 ptheta_lab =25.02
 ppcentral = 1.4
 
 2085-2086
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =30.06
 ppcentral = 3.349
 
 2087-2088
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =35.06
 ppcentral = 2.869
 
 2214-2220
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 26.98
 ppartmass =  0.00051099
 ptheta_lab =25.0
 ppcentral = 3.911
 
 2221-2229
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.0
 ppcentral = 3.911
 
 2230-2231
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.0
 ppcentral = 3.6
 
 2231-2231
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =25.0
 ppcentral = 3.349
 
 2232-2232
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 1.00794
 ppartmass =  0.00051099
 ptheta_lab =30.005
 ppcentral = 3.349
 
 2233-2234
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 12.0107
 ppartmass =  0.00051099
 ptheta_lab =22.0
 ppcentral = 3.2
 
 2235-2239
-gpbeam = 6.404
+gpbeam = 6.430
 gtargmass_amu= 12.0107
 ppartmass =  0.00051099
 ptheta_lab =30.0