diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java
index 13bfdd74de5..f6cb78146d1 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/preferences/CodeAssistPreferencePage.java
@@ -43,7 +43,8 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage {
 		ArrayList overlayKeys = new ArrayList();
 
 		// temporary
-		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.USE_DOM));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.DONT_USE_DOM));
+		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.TIME_DOM));
 		
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.INT, ContentAssistPreference.AUTOACTIVATION_DELAY));
 		overlayKeys.add(new OverlayPreferenceStore.OverlayKey(OverlayPreferenceStore.BOOLEAN, ContentAssistPreference.AUTOINSERT));
@@ -78,7 +79,8 @@ public class CodeAssistPreferencePage extends AbstractPreferencePage {
 		contentAssistComposite.setLayout(layout);
 
 		// temporary use DOM
-		addCheckBox(contentAssistComposite, "Use DOM (Work in progress)", ContentAssistPreference.USE_DOM, 0);
+		addCheckBox(contentAssistComposite, "Use Old Content Assist (Work in progress)", ContentAssistPreference.DONT_USE_DOM, 0);
+		addCheckBox(contentAssistComposite, "Print Completion Times (Work in progress)", ContentAssistPreference.TIME_DOM, 0);
 		
 		//&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&
 		// The following three radio buttons are grouped together
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
index 2f4a7462af3..a8a53e8af16 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/CSourceViewerConfiguration.java
@@ -199,9 +199,9 @@ public class CSourceViewerConfiguration extends TextSourceViewerConfiguration {
 		ContentAssistant assistant = new ContentAssistant();
 		
 		IContentAssistProcessor processor
-			= getPreferenceStore().getBoolean(ContentAssistPreference.USE_DOM)
-			? (IContentAssistProcessor)new CCompletionProcessor2(getEditor())
-			: (IContentAssistProcessor)new CCompletionProcessor(getEditor());
+			= getPreferenceStore().getBoolean(ContentAssistPreference.DONT_USE_DOM)
+			? (IContentAssistProcessor)new CCompletionProcessor(getEditor())
+			: (IContentAssistProcessor)new CCompletionProcessor2(getEditor());
 		assistant.setContentAssistProcessor(processor, IDocument.DEFAULT_CONTENT_TYPE);
 
 		//Will this work as a replacement for the configuration lines below?
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
index edc703f2110..54b9e397885 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/CCompletionProcessor2.java
@@ -80,12 +80,14 @@ public class CCompletionProcessor2 implements IContentAssistProcessor {
 					contributor.contributeCompletionProposals(viewer, offset, workingCopy, completionNode, proposals);
 				}
 			}
-			
-			long propTime = System.currentTimeMillis();
-			System.out.println("Completion Parse: " + (stopTime - startTime) + " + Proposals: " //$NON-NLS-1$ //$NON-NLS-2$
-					+ (propTime - stopTime));
-			System.out.flush();
 
+			if (CUIPlugin.getDefault().getPreferenceStore().getBoolean(ContentAssistPreference.TIME_DOM)) {
+				long propTime = System.currentTimeMillis();
+				System.out.println("Completion Parse: " + (stopTime - startTime) + " + Proposals: " //$NON-NLS-1$ //$NON-NLS-2$
+						+ (propTime - stopTime));
+				System.out.flush();
+			}
+			
 			if (!proposals.isEmpty()) {
 				errorMessage = null;
 				return (ICompletionProposal[])proposals.toArray(new ICompletionProposal[proposals.size()]);
diff --git a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
index 0b51d64261a..6636afe6d5f 100644
--- a/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
+++ b/core/org.eclipse.cdt.ui/src/org/eclipse/cdt/internal/ui/text/contentassist/ContentAssistPreference.java
@@ -23,7 +23,8 @@ import org.eclipse.jface.util.PropertyChangeEvent;
 public class ContentAssistPreference {
 	
 	// Temporary to use DOM for assist
-	public final static String USE_DOM = "content_assist_use_dom"; //$NON-NLS-1$
+	public final static String DONT_USE_DOM = "content_assist_dont_use_dom"; //$NON-NLS-1$
+	public final static String TIME_DOM = "content_assist_time_dom"; //$NON-NLS-1$
 	
 	/** Preference key for content assist auto activation */
 	//public final static String AUTOACTIVATION=  "content_assist_autoactivation";