diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
index 12cd67f7..8a9a7d35 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/collaborationutils/CoInvestigationData.java
@@ -1,21 +1,29 @@
 /* $This file is distributed under the terms of the license in /doc/license.txt$ */
 package edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils;
 
+import java.util.HashMap;
 import java.util.HashSet;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.Set;
 
+import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Activity;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaboration;
 import edu.cornell.mannlib.vitro.webapp.visualization.valueobjects.Collaborator;
 
 public class CoInvestigationData extends CollaborationData {
+	private Map<String, Activity> grantMap = new HashMap<>();
 
 	public CoInvestigationData(Collaborator egoCollaborator,
-			Set<Collaborator> collaborators, Set<Collaboration> collaborations) {
+			Set<Collaborator> collaborators, Set<Collaboration> collaborations, Map<String, Activity> grantMap) {
 		super(egoCollaborator, collaborators, collaborations);
+		this.grantMap = grantMap;
 	}
-	
+
+	public Map<String, Activity> getGrants() {
+		return grantMap;
+	}
+
 	public Set<Map<String, String>> initializeEdgeSchema() {
 
 		Set<Map<String, String>> edgeSchema = new HashSet<Map<String, String>>();
diff --git a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
index 925ff5e6..622b5ae4 100644
--- a/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
+++ b/src/edu/cornell/mannlib/vitro/webapp/visualization/personlevel/PersonLevelRequestHandler.java
@@ -7,6 +7,7 @@ import java.util.Map;
 
 import edu.cornell.mannlib.vitro.webapp.config.ConfigurationProperties;
 import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoAuthorshipData;
+import edu.cornell.mannlib.vitro.webapp.visualization.collaborationutils.CoInvestigationData;
 import edu.cornell.mannlib.vitro.webapp.visualization.visutils.CollaborationDataViewHelper;
 import org.apache.axis.utils.StringUtils;
 import org.apache.commons.logging.Log;
@@ -103,19 +104,11 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 			VitroRequest vitroRequest, Log log, Dataset dataset, String egoURI,
 			String visMode) throws MalformedQueryParametersException {
 		
-		if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)) { 
-        	
-			
-			
-        	ModelConstructor constructQueryRunner = 
-        			new CoPIGrantCountConstructQueryRunner(egoURI, vitroRequest.getRDFService(), log);
-    		Model constructedModel = constructQueryRunner.getConstructedModel();
-    		
-    		QueryRunner<CollaborationData> coPIQueryManager = 
-    				new CoPIGrantCountQueryRunner(egoURI, vitroRequest.getRDFService(), log);
-           
-            CollaborationData coPIData = coPIQueryManager.getQueryResult();
-            
+		if (VisualizationFrameworkConstants.COPI_VIS_MODE.equalsIgnoreCase(visMode)) {
+			CoPIGrantCountQueryRunner coPIQueryManager = new CoPIGrantCountQueryRunner(egoURI, vitroRequest.getRDFService(), log);
+
+			CoInvestigationData coPIData = coPIQueryManager.getQueryResult();
+
 	    	/*
 	    	 * grants over time sparkline
 	    	 */
@@ -123,8 +116,10 @@ public class PersonLevelRequestHandler implements VisualizationRequestHandler {
 											 UtilityFunctions
 											 	.getIndividualLabelFromDAO(vitroRequest, egoURI));
 
-    		Map<String, Activity> grantsToURI = SelectOnModelUtilities.getGrantsForPerson(vitroRequest.getRDFService(), person, false);
-    		
+//    		Map<String, Activity> grantsToURI = SelectOnModelUtilities.getGrantsForPerson(vitroRequest.getRDFService(), person, false);
+
+			Map<String, Activity> grantsToURI = coPIData.getGrants();
+
         	/*
         	 * Create a map from the year to number of grants. Use the Grant's
         	 * parsedGrantYear to populate the data.