diff --git a/nginx-static/.gitignore b/nginx-static/.gitignore
deleted file mode 100644
index bf0a1c1..0000000
--- a/nginx-static/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-response-time.csv
-tps.csv
\ No newline at end of file
diff --git a/nginx-static/response-time.gnuplot b/nginx-static/latency.gnuplot
similarity index 63%
rename from nginx-static/response-time.gnuplot
rename to nginx-static/latency.gnuplot
index f2cbbb9..7eeeccd 100644
--- a/nginx-static/response-time.gnuplot
+++ b/nginx-static/latency.gnuplot
@@ -5,5 +5,5 @@ set format x "%H:%M:%S"
 set xlabel "Time";
 set ylabel "Latency (ms)";
 set terminal png size 1280,1024
-set output 'response-time.png'
-plot 'response-time.csv' using ($1/1000):15 with points pt 1 ps 0.5
+set output outfile
+plot dataset using ($1/1000):15 with points pt 1 ps 0.5
diff --git a/nginx-static/nginx-static.jmx b/nginx-static/nginx-static.jmx
index ba8ca99..5a57a38 100644
--- a/nginx-static/nginx-static.jmx
+++ b/nginx-static/nginx-static.jmx
@@ -56,96 +56,6 @@
           <hashTree/>
         </hashTree>
       </hashTree>
-      <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.ResponseTimesOverTimeGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="Response Times Over Time" enabled="true">
-        <boolProp name="ResultCollector.error_logging">false</boolProp>
-        <objProp>
-          <name>saveConfig</name>
-          <value class="SampleSaveConfiguration">
-            <time>true</time>
-            <latency>true</latency>
-            <timestamp>true</timestamp>
-            <success>true</success>
-            <label>true</label>
-            <code>true</code>
-            <message>true</message>
-            <threadName>true</threadName>
-            <dataType>true</dataType>
-            <encoding>false</encoding>
-            <assertions>true</assertions>
-            <subresults>true</subresults>
-            <responseData>false</responseData>
-            <samplerData>false</samplerData>
-            <xml>false</xml>
-            <fieldNames>true</fieldNames>
-            <responseHeaders>false</responseHeaders>
-            <requestHeaders>false</requestHeaders>
-            <responseDataOnError>false</responseDataOnError>
-            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
-            <assertionsResultsToSave>0</assertionsResultsToSave>
-            <bytes>true</bytes>
-            <sentBytes>true</sentBytes>
-            <url>true</url>
-            <threadCounts>true</threadCounts>
-            <idleTime>true</idleTime>
-            <connectTime>true</connectTime>
-          </value>
-        </objProp>
-        <stringProp name="filename">response-time.csv</stringProp>
-        <longProp name="interval_grouping">500</longProp>
-        <boolProp name="graph_aggregated">false</boolProp>
-        <stringProp name="include_sample_labels"></stringProp>
-        <stringProp name="exclude_sample_labels"></stringProp>
-        <stringProp name="start_offset"></stringProp>
-        <stringProp name="end_offset"></stringProp>
-        <boolProp name="include_checkbox_state">false</boolProp>
-        <boolProp name="exclude_checkbox_state">false</boolProp>
-      </kg.apc.jmeter.vizualizers.CorrectedResultCollector>
-      <hashTree/>
-      <kg.apc.jmeter.vizualizers.CorrectedResultCollector guiclass="kg.apc.jmeter.vizualizers.TransactionsPerSecondGui" testclass="kg.apc.jmeter.vizualizers.CorrectedResultCollector" testname="Transactions per Second" enabled="true">
-        <boolProp name="ResultCollector.error_logging">false</boolProp>
-        <objProp>
-          <name>saveConfig</name>
-          <value class="SampleSaveConfiguration">
-            <time>true</time>
-            <latency>true</latency>
-            <timestamp>true</timestamp>
-            <success>true</success>
-            <label>true</label>
-            <code>true</code>
-            <message>true</message>
-            <threadName>true</threadName>
-            <dataType>true</dataType>
-            <encoding>false</encoding>
-            <assertions>true</assertions>
-            <subresults>true</subresults>
-            <responseData>false</responseData>
-            <samplerData>false</samplerData>
-            <xml>false</xml>
-            <fieldNames>true</fieldNames>
-            <responseHeaders>false</responseHeaders>
-            <requestHeaders>false</requestHeaders>
-            <responseDataOnError>false</responseDataOnError>
-            <saveAssertionResultsFailureMessage>true</saveAssertionResultsFailureMessage>
-            <assertionsResultsToSave>0</assertionsResultsToSave>
-            <bytes>true</bytes>
-            <sentBytes>true</sentBytes>
-            <url>true</url>
-            <threadCounts>true</threadCounts>
-            <idleTime>true</idleTime>
-            <connectTime>true</connectTime>
-          </value>
-        </objProp>
-        <stringProp name="filename">tps.csv</stringProp>
-        <longProp name="interval_grouping">1000</longProp>
-        <boolProp name="graph_aggregated">false</boolProp>
-        <stringProp name="include_sample_labels"></stringProp>
-        <stringProp name="exclude_sample_labels"></stringProp>
-        <stringProp name="start_offset"></stringProp>
-        <stringProp name="end_offset"></stringProp>
-        <boolProp name="include_checkbox_state">false</boolProp>
-        <boolProp name="exclude_checkbox_state">false</boolProp>
-      </kg.apc.jmeter.vizualizers.CorrectedResultCollector>
-      <hashTree/>
     </hashTree>
   </hashTree>
 </jmeterTestPlan>
diff --git a/nginx-static/run.sh b/nginx-static/run.sh
index 9d33b42..4194660 100755
--- a/nginx-static/run.sh
+++ b/nginx-static/run.sh
@@ -6,6 +6,6 @@ set -e # Do not update graphs if jmeter fails
 : ${GNUPLOT:=gnuplot}
 HEAP="-Xms1g -Xmx1g -XX:MaxMetaspaceSize=256m"
 date="$(date +%F-%H-%M-%S)"
-rm -f response-time.csv tps.csv
 $JMETER -n -t nginx-static.jmx -l "results-$date.csv" -e -o "report-$date"
-#$GNUPLOT -p response-time.gnuplot 
+$GNUPLOT -e "dataset='results-$date.csv'" -e "outfile='latency-$date.png'" -p latency.gnuplot
+$GNUPLOT -e "dataset='results-$date.csv'" -e "outfile='throughput-$date.png'" -p throughput.gnuplot
diff --git a/nginx-static/throughput.gnuplot b/nginx-static/throughput.gnuplot
new file mode 100644
index 0000000..cb5dd04
--- /dev/null
+++ b/nginx-static/throughput.gnuplot
@@ -0,0 +1,11 @@
+set datafile separator ','
+set xlabel "Time";
+set ylabel "Transactions per second";
+set terminal png size 1280,1024
+set output outfile
+
+# Aggregate transactions over a second
+binwidth=1000
+bin(x,width)=width*floor(x/width)
+
+plot dataset using (bin($1,binwidth)):(1.0) smooth freq with boxes