diff --git a/src/main/java/com/soulgalore/web/performance/navigation/run/FetchNavigationTiming.java b/src/main/java/com/soulgalore/web/performance/navigation/run/FetchNavigationTiming.java
index 3567727ac..80a453984 100644
--- a/src/main/java/com/soulgalore/web/performance/navigation/run/FetchNavigationTiming.java
+++ b/src/main/java/com/soulgalore/web/performance/navigation/run/FetchNavigationTiming.java
@@ -41,7 +41,6 @@
 import com.google.inject.Guice;
 import com.google.inject.Injector;
 
-
 import com.soulgalore.web.performance.navigation.NavigationTiming;
 import com.soulgalore.web.performance.navigation.NavigationTimingCreator;
 
@@ -65,9 +64,8 @@ public class FetchNavigationTiming {
 	private static final String DOM_INTERACTIVE = "DOMInteractive";
 	private static final String DOM_COMPLETE = "DOMComplete";
 	private static final String NAVIGATION_AND_PAGE_LOAD = "NavigationAndPageLoad";
-	// TODO add first paint
 	private static final String FIRST_PAINT = "FirstPaint";
-	
+
 	private static final String ENCODING = "UTF-8";
 
 	public static void main(String[] args) throws ParseException {
@@ -111,8 +109,8 @@ public void fetch(String[] args) throws ParseException {
 			NavigationTimingCreator creator = injector
 					.getInstance(NavigationTimingCreator.class);
 
-			NavigationTiming timing = creator.get(conf.getURL(),
-					"run:" + i + 1);
+			NavigationTiming timing = creator
+					.get(conf.getURL(), "run:" + i + 1);
 
 			addStats(timing, stats);
 			timings.add(timing);
@@ -174,6 +172,7 @@ private void addStats(NavigationTiming timing,
 		stats.get(DOM_COMPLETE).addValue(timing.getDomComplete());
 		stats.get(NAVIGATION_AND_PAGE_LOAD).addValue(
 				timing.getNavigationAndPageLoad());
+		stats.get(FIRST_PAINT).addValue(timing.getFirstPaint());
 	}
 
 	private Map<String, DescriptiveStatistics> getStatisticsMap() {
@@ -188,6 +187,7 @@ private Map<String, DescriptiveStatistics> getStatisticsMap() {
 		stats.put(DOM_INTERACTIVE, new DescriptiveStatistics());
 		stats.put(DOM_COMPLETE, new DescriptiveStatistics());
 		stats.put(NAVIGATION_AND_PAGE_LOAD, new DescriptiveStatistics());
+		stats.put(FIRST_PAINT, new DescriptiveStatistics());
 		return stats;
 	}