Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/LabeledMultiDigraph.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/LabeledMultiDigraph.java (revision 201)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/LabeledMultiDigraph.java (revision 204)
@@ -16,4 +16,5 @@
     List<String> labels;
     HashMap<String,Integer> labelednodes;
+    List<Map<Integer,List<LabeledEdge>>> gadjlist; // node, node-edge list
     
     public class LabeledEdge{
@@ -41,4 +42,5 @@
         labels.add(label);
         adjlist.add(new LinkedList<LabeledEdge>());
+        gadjlist.add(new HashMap<Integer, List<LabeledEdge>>());
     }
     
@@ -50,4 +52,6 @@
         LabeledEdge edge = new LabeledEdge(node2, elabel, direction, ntriples);
         adjlist.get(node1).add(edge);
+        Map<Integer, List<LabeledEdge>> edges = gadjlist.get(node1);
+        // 
     }
 }
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (revision 201)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/OWLClassGraph.java (revision 204)
@@ -21,5 +21,5 @@
     int th;
     int prunecut;
-        
+
     public class LinkAndPath{
         String originalClassURI; // originalClasssURI -classLink.propertyURI-> classLink.linkedClassURL
@@ -41,5 +41,5 @@
         }
     }
-    
+        
     public OWLClassGraph(String startClass, String endClass){
         super();
@@ -52,6 +52,5 @@
         nsteps = 3;
         limit = 1000;
-        prunecut = 100;
-        
+        prunecut = 100;        
     }
 
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 201)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/QueryPathGenerator.java (revision 204)
@@ -44,22 +44,4 @@
         QueryPathGenerator qpg1 = new QueryPathGenerator(sp, "cdata/");
         //SClass[] cl = qpg.getClasses(null);
-        
-        /*
-        long start1 = System.currentTimeMillis();
-        Path[] path1 = qpg1.getPaths(sc, ec, false);
-        long end1 = System.currentTimeMillis();
-        
-        QueryPathGenerator qpg2 = new QueryPathGenerator(sp, "ddata/");
-        long start2 = System.currentTimeMillis();
-        Path[] path2 = qpg2.getPaths(sc, ec, false);
-        long end2 = System.currentTimeMillis();
-        System.out.println("TOTAL1:");
-        System.out.println(end1 - start1);
-        System.out.println("TOTAL2:");
-        System.out.println(end2 - start2);
-        
-        System.out.println(path1.length);
-        System.out.println(path2.length);
-        */
     }
     
@@ -112,6 +94,4 @@
 
     private void setAnalyzer(){
-        //analyzer = new EndpointAnalyzer(sparqlEndpoint); //ForTest
-        
         try {
             analyzer = factory.create(sparqlEndpoint);
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/SimpleClassGraph.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/OWL/SimpleClassGraph.java (revision 203)
+++  (revision )
@@ -1,25 +1,0 @@
-/*
- * To change this license header, choose License Headers in Project Properties.
- * To change this template file, choose Tools | Templates
- * and open the template in the editor.
- */
-
-package org.biohackathon.SPARQLBuilder.OWL;
-
-/**
- *
- * @author atsuko
- */
-import java.util.*;
-
-public class SimpleClassGraph {
-    //private int nnode;
-    private String[] classURIs;
-    private List<Map<Integer,Integer>> edges; // node, node, number of edges
-    
-    /*
-    public class SCEdge{
-        //int node;
-        int nedge;    
-    }*/
-}
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java (revision 175)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/PLServlet.java (revision 204)
@@ -66,4 +66,8 @@
         //processRequest(request, response);
         response.setContentType("application/json;charset=UTF-8");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET");
+        response.setHeader("Access-Control-Allow-Headers", request.getHeader("Access-Control-Request-Headers"));
+        response.setHeader("Access-Control-Max-Age", "-1");
 	PrintWriter out = response.getWriter();
         String ep = request.getParameter("ep");
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 197)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/CLServlet.java (revision 204)
@@ -69,4 +69,8 @@
         //processRequest(request, response);
         response.setContentType("application/json;charset=UTF-8");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET");
+        response.setHeader("Access-Control-Allow-Headers", request.getHeader("Access-Control-Request-Headers"));
+        response.setHeader("Access-Control-Max-Age", "-1");     
 	PrintWriter out = response.getWriter();
         String ep = request.getParameter("ep");
@@ -74,5 +78,4 @@
         QueryPathGenerator qpg = (QueryPathGenerator)session.getAttribute("qpg");
         if ( qpg == null ){
-        //QueryPathGenerator 
                    qpg = new QueryPathGenerator();
         }
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java (revision 193)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/SPServlet.java (revision 204)
@@ -78,5 +78,9 @@
         //processRequest(request, response);
         response.setContentType("application/json;charset=UTF-8");
-	PrintWriter out = response.getWriter();
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET");
+        response.setHeader("Access-Control-Allow-Headers", request.getHeader("Access-Control-Request-Headers"));
+        response.setHeader("Access-Control-Max-Age", "-1");
+        PrintWriter out = response.getWriter();
         String jpath = request.getParameter("jsonpath");
         Path path = null;
Index: SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/EPServlet.java
===================================================================
--- SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/EPServlet.java (revision 175)
+++ SPARQLBuilderWWW/src/java/org/biohackathon/SPARQLBuilder/www/EPServlet.java (revision 204)
@@ -72,4 +72,8 @@
         
         response.setContentType("application/json;charset=UTF-8");
+        response.setHeader("Access-Control-Allow-Origin", "*");
+        response.setHeader("Access-Control-Allow-Methods", "GET");
+        response.setHeader("Access-Control-Allow-Headers", request.getHeader("Access-Control-Request-Headers"));
+        response.setHeader("Access-Control-Max-Age", "-1");        
 	PrintWriter out = response.getWriter();
         if ( qpg == null ){