diff --git a/Paper/GlitchMCNoiseOnly/SingleGlitchMCNoiseOnly.sh b/Paper/GlitchMCNoiseOnly/SingleGlitchMCNoiseOnly.sh
index e532a79868baff60d8f9d9bd05b3b4861a24dd25..fb434dbbb7fbe308a66f1ec8b95d394f7923ba81 100755
--- a/Paper/GlitchMCNoiseOnly/SingleGlitchMCNoiseOnly.sh
+++ b/Paper/GlitchMCNoiseOnly/SingleGlitchMCNoiseOnly.sh
@@ -4,7 +4,7 @@
 export PATH="/home/gregory.ashton/anaconda2/bin:$PATH"
 export MPLCONFIGDIR=/home/gregory.ashton/.config/matplotlib
 
-for ((n=0;n<90;n++))
+for ((n=0;n<5;n++))
 do
 /home/gregory.ashton/anaconda2/bin/python generate_data.py "$1" /local/user/gregory.ashton --no-interactive
 done
diff --git a/Paper/GlitchMCNoiseOnly/plot_data.py b/Paper/GlitchMCNoiseOnly/plot_data.py
index 3e3378d0d578ef100e6fff96ee6924deb811db4f..b04d689036920957b0b601dfdb08fb75473a5034 100644
--- a/Paper/GlitchMCNoiseOnly/plot_data.py
+++ b/Paper/GlitchMCNoiseOnly/plot_data.py
@@ -7,6 +7,7 @@ from tqdm import tqdm
 from oct2py import octave
 import glob
 from scipy.stats import rv_continuous, chi2
+from latex_macro_generator import write_to_macro
 
 filenames = glob.glob("CollectedOutput/*.txt")
 
@@ -21,21 +22,27 @@ for fn in filenames:
     df['CLUSTER_ID'] = fn.split('_')[1]
     df_list.append(df)
 df = pd.concat(df_list)
-print 'Number of samples = ', len(df)
-print 'Max twoF', df.twoF.max()
 
 fig, ax = plt.subplots()
 for ng in np.unique(df.nglitches.values):
-    ax.hist(df[df.nglitches==ng].twoF, bins=20, histtype='step', normed=True,
+    print 'ng={}'.format(ng)
+    Nsamples = len(df[df.nglitches == ng])
+    MaxtwoF = df[df.nglitches == ng].twoF.max()
+    print 'Number of samples = ', Nsamples
+    print 'Max twoF', MaxtwoF
+
+    ax.hist(df[df.nglitches == ng].twoF, bins=40, histtype='step', normed=True,
             linewidth=1, label='$N_\mathrm{{glitches}}={}$'.format(ng))
 
-ax.set_xlabel('$\widehat{2\mathcal{F}}$ for 1 glitch')
+    write_to_macro('DirectedMC{}GlitchNoiseOnlyMaximum'.format(ng),
+                   '{:1.1f}'.format(MaxtwoF), '../macros.tex')
+    write_to_macro('DirectedMC{}GlitchNoiseN'.format(ng),
+                   '{:1.0f}'.format(Nsamples), '../macros.tex')
+
+ax.set_xlabel('$\widehat{2\mathcal{F}}$')
 ax.set_xlim(0, 90)
 ax.legend(frameon=False, fontsize=6)
 fig.tight_layout()
-fig.savefig('single_glitch_noise_twoF_histogram.png')
+fig.savefig('glitch_noise_twoF_histogram.png')
+
 
-#from latex_macro_generator import write_to_macro
-#write_to_macro('DirectedMCNoiseOnlyMaximum', '{:1.1f}'.format(np.max(df.twoF)),
-#               '../macros.tex')
-#write_to_macro('DirectedMCNoiseN', len(df), '../macros.tex')
diff --git a/Paper/GlitchMCNoiseOnly/submitfile b/Paper/GlitchMCNoiseOnly/submitfile
index a11d97e56c04d2df256b1f20966eb493cecaeea3..cb3ef0770ed09e7abe626e26200584c76ab722a4 100644
--- a/Paper/GlitchMCNoiseOnly/submitfile
+++ b/Paper/GlitchMCNoiseOnly/submitfile
@@ -2,11 +2,11 @@ Executable= SingleGlitchMCNoiseOnly.sh
 Arguments= $(Cluster)_$(Process)
 Universe=vanilla
 Input=/dev/null
-accounting_group = ligo.dev.o2.cw.explore.test
+accounting_group=ligo.dev.o1.cw.directedisolatedother.semicoherent 
 Output=CollectedOutput/out.$(Cluster).$(Process)
 Error=CollectedOutput/err.$(Cluster).$(Process)
 Log=CollectedOutput/log.$(Cluster).$(Process)
 request_cpus = 1
 request_memory = 16 GB
 
-Queue 100
+Queue 170
diff --git a/Paper/glitch_noise_twoF_histogram.png b/Paper/glitch_noise_twoF_histogram.png
new file mode 100644
index 0000000000000000000000000000000000000000..3068a22984eecb41fcfccc6d968bfe98801192a3
Binary files /dev/null and b/Paper/glitch_noise_twoF_histogram.png differ
diff --git a/Paper/macros.tex b/Paper/macros.tex
index 6ec6b01c34ce322e81d6882b8d98f23eb5e0cf99..b4477a9b8e5005871cc220e4dde664eba131bd45 100644
--- a/Paper/macros.tex
+++ b/Paper/macros.tex
@@ -12,8 +12,13 @@
 \def\BasicExamplehzero{1.0{\times}10^{-24}}
 \def\BasicExamplenburn{50.0}
 \def\BasicExamplenprod{50.0}
+\def\DirectedMC{}GlitchNoiseN{970.0}
 \def\DirectedMCNoiseN{1.0{\times}10^{4}}
 \def\DirectedMCNoiseOnlyMaximum{52.4}
+\def\DirectedMConeGlitchNoiseN{10000}
+\def\DirectedMConeGlitchNoiseOnlyMaximum{82.6}
+\def\DirectedMCtwoGlitchNoiseN{970}
+\def\DirectedMCtwoGlitchNoiseOnlyMaximum{80.8}
 \def\SingleGlitchDepth{10.0}
 \def\SingleGlitchFCMismatch{0.7}
 \def\SingleGlitchFCtwoF{718.5}
diff --git a/Paper/single_glitch_noise_twoF_histogram.png b/Paper/single_glitch_noise_twoF_histogram.png
deleted file mode 100644
index 0c97d5ba511ee678fc56d0e19c61db7bb06b4048..0000000000000000000000000000000000000000
Binary files a/Paper/single_glitch_noise_twoF_histogram.png and /dev/null differ