diff --git a/code.js b/code.js
index d5db352..049f079 100644
--- a/code.js
+++ b/code.js
@@ -47,8 +47,8 @@ $(function () { // on dom ready
          			SUID: name,
          			Type: "Protein",
          			Valign: "Middle",
-         			Width: 80.75,
-         			Height: 100,
+         			Width: 100,
+         			Height: 25,
          			id: name,
          			name: name,
          			selected: false,
@@ -69,33 +69,33 @@ $(function () { // on dom ready
 	}
 	
 	function addEdge(event){
+		for(var i = 0; i < selectedForEditNodes.length-1; i++){
+			var sourceE = selectedForEditNodes[i].data('GraphId');
+			var targetE = selectedForEditNodes[i+1].data('GraphId');
 		
-		var sourceE = prompt("Enter source.");
-		var targetE = prompt("Enter target.");
-		var typeE = prompt("Enter type.");
-		
-		var edge = [];
+			var edge = [];
 		
-    	edge.push({ 
-			group: "edges",
-			data : {
-        	   	id : "e"+edgeCounter,
-            	SUID : "e"+edgeCounter,
-            	LineThickness:1.0,
-            	EndArrow:typeE,
-            	Coords:[{"x":0,"y":0},{"x":0,"y":0}],
-            	GraphId:"e"+edgeCounter,
-            	ZOrder:"12288",
-            	source:sourceE,
-            	target:targetE, 
-            	StartArrow : typeE,
-        		selected : false
-      		},
-      		selected : false
-    	})
+    		edge.push({ 
+				group: "edges",
+				data : {
+        		   	id : "e"+edgeCounter,
+            		SUID : "e"+edgeCounter,
+            		LineThickness:1.0,
+            		EndArrow:"Line",
+           		 	Coords:[{"x":0,"y":0},{"x":0,"y":0}],
+           		 	GraphId:"e"+edgeCounter,
+           	 		ZOrder:"12288",
+            		source:sourceE,
+            		target:targetE, 
+            		StartArrow : "Line",
+        			selected : false
+      			},
+      			selected : false
+    		})
     	
-    	edgeCounter++;
-    	window.cy.add(edge);
+    		edgeCounter++;
+    		window.cy.add(edge);
+    	}
     }
 	
 	function bundle(event){		
@@ -304,10 +304,10 @@ $(function () { // on dom ready
 				
 				// node & edge elements (selected state)
 				.selector('edge:selected').css({
-					'background-color': 'black',
-					'line-color': 'black',
-					'target-arrow-color': 'black',
-					'source-arrow-color': 'black'
+					'background-color': 'yellow',
+					'line-color': 'yellow',
+					'target-arrow-color': 'yellow',
+					'source-arrow-color': 'yellow'
 				})
 				.selector('node:selected').css({
 					'background-color': 'yellow'
@@ -369,102 +369,8 @@ $(function () { // on dom ready
 				var selectedNodes = [];
 		
 				// custom event handlers
-				cy.off('click', 'node').on('click', 'node', function (e) {
-
-					e.preventDefault();
-
-					var node = this;
-
-					var node_name = node.data("shared_name");
-					selectedForQueryNodes.push(node_name);
-					var node_id = node.data("id");
-					var count = selectedForQueryNodes.filter(function (value) {
-						return value === node_name;
-					}).length;
+				cy.on('click', 'node', function (event) {
 					
-					// RNA
-					if (count == 1) {						
-						node.addClass('green_bg');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					} 
-					
-					if (count == 2) {
-						node.removeClass('green_bg');
-						node.addClass('red_bg');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					// CNV Added
-					if (count == 3) {
-						node.addClass('purple_border');
-						node.addClass('green_bg');
-						node.removeClass('red_bg');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 4) {
-						node.addClass('purple_border');
-						node.addClass('red_bg');
-						node.removeClass('green_bg');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 5) {
-						node.addClass('red_border');
-						node.addClass('green_bg');
-						node.removeClass('red_bg');
-						node.removeClass('purple_border');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 6) {
-						node.addClass('red_border');
-						node.addClass('red_bg');
-						node.removeClass('green_bg');
-						node.removeClass('purple_border');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 7) {
-						node.addClass('red_shadow');
-						node.addClass('red_bg');
-						node.addClass('purple_border');
-						
-						node.removeClass('green_bg');
-						node.removeClass('red_border');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 8) {
-						node.addClass('red_shadow');
-						node.addClass('red_bg');
-						node.addClass('red_border');
-						
-						node.removeClass('green_bg');
-						node.removeClass('purple_border');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 9) {
-						node.addClass('red_shadow');
-						node.addClass('green_bg');
-						node.addClass('red_border');
-						
-						node.removeClass('red_bg');
-						node.removeClass('purple_border');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-					
-					if (count == 10) {
-						node.addClass('red_shadow');
-						node.addClass('green_bg');
-						node.addClass('purple_border');
-						
-						node.removeClass('red_bg');
-						node.removeClass('red_border');
-						$('#variable').val($('#variable').val() + node_name + " ");
-					}
-                   				
 				});
 
 				cy.on('cxttapstart ', 'node', function(event){
@@ -472,6 +378,10 @@ $(function () { // on dom ready
 					dialogNode.dialog("open");
 				});
 				
+				cy.on('cxttapstart ', 'edge', function(event){
+					target = event.cyTarget;
+					dialogEdge.dialog("open");
+				});
 				
 				cy.on('select', 'node', function(event){
 			    	selectedForEditNodes = cy.$('node:selected');
@@ -490,7 +400,7 @@ $(function () { // on dom ready
   			panningEnabled: true,
   			userPanningEnabled: true,
  	 		boxSelectionEnabled: true,
-  			selectionType: 'single',
+  			selectionType: 'additive',
   			touchTapThreshold: 8,
   			desktopTapThreshold: 4,
   			autolock: false,
diff --git a/get.php b/get.php
index f0428c8..0f26c6f 100644
--- a/get.php
+++ b/get.php
@@ -27,7 +27,7 @@
  * Time: 12:10 PM
  */
 
-$servername = "localhost";
+$servername = "137.99.11.122:3306";
 $username = "root";
 $password = "root";
 $dbname = "pathway";
diff --git a/index.php b/index.php
index 2ce9eed..df88f7b 100644
--- a/index.php
+++ b/index.php
@@ -64,6 +64,34 @@
 	<input id="bundle" value="Bundle" type="button"/></input>
 	<input id="produceJSON" value="Export JSON" type="button"/></input>
 	
+	<form id="form-data" method="post" action="http://137.99.11.122/pathway2/get.php" target="_blank">
+		<input type="hidden" name="variable" id="variable"><br>
+		<!--<input type="hidden" name="rna" id="rna"><br>
+		<input type="hidden" name="cnv" id="cnv"><br>
+		<input type="hidden" name="mut" id="mut"><br>
+		<input type="hidden" name="ts_gene" id="ts_gene"><br>
+		<input type="hidden" name="onco_gene" id="onco_gene"><br>-->
+	<input type="submit" value="Submit">
+	
+	<div id="dialog-form-edge" title="Edit edge">
+ 		<form>
+    		<fieldset>
+      			<label for="direction">change direction:</label>
+      			<input type="checkbox" name="direction" id="direction" value="Yes">
+      			
+      			<label for="type-edge">type:</label>
+      			<select style="width: 150px" id="type-edge" name="type-edge">
+  					<option selected="">Please Select</option>
+  					<option>TBar</option>
+  					<option>Arrow</option>
+  					<option>Line</option>
+				</select>
+ 
+ 			    <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
+    		</fieldset>
+  		</form>
+	</div>
+	
 	<div id="dialog-form-node" title="Edit node">
  		<form>
     		<fieldset>
@@ -75,6 +103,21 @@
       			
       			<label for="width">width:</label>
       			<input type="text" name="width" id="width" value="" class="text ui-widget-content ui-corner-all">
+      			
+      			<label for="type">type:</label>
+      			<select style="width: 150px" id="type" name="type">
+  					<option selected="">Please Select</option>
+  					<option>1</option>
+  					<option>2</option>
+  					<option>3</option>
+  					<option>4</option>
+  					<option>5</option>
+  					<option>6</option>
+  					<option>7</option>
+  					<option>8</option>
+  					<option>9</option>
+  					<option>10</option>
+				</select>
  
  			    <input type="submit" tabindex="-1" style="position:absolute; top:-1000px">
     		</fieldset>
@@ -83,13 +126,142 @@
 	<div id="cy"></div>
 </body>
 <script>
-	function edit() {
-		name = document.getElementById("name").value;
-		width = document.getElementById("width").value;
-		height = document.getElementById("height").value;
+	function clone(obj) {
+    	if (null == obj || "object" != typeof obj) return obj;
+    	var copy = obj.constructor();
+    	for (var attr in obj) {
+    	    if (obj.hasOwnProperty(attr)) copy[attr] = obj[attr];
+    	}
+    	return copy;
+	}
+
+
+	function editEdge() {
+		var direction = document.getElementById("direction").value;
+		var type = document.getElementById("type-edge").value;
+		target.data('StartArrow',type);
+		target.data('EndArrow',type);
+		if(document.getElementById('direction').checked){
+			var edge = [];
+		
+    		edge.push({ 
+				group: "edges",
+				data : {
+        		   	id : target.data('id'),
+            		SUID : target.data('SUID'),
+            		LineThickness:target.data('LineThickness'),
+            		EndArrow: target.data('EndArrow'),
+           		 	Coords: target.data('Coords'),
+           		 	GraphId: target.data('GraphId'),
+           	 		ZOrder: target.data('ZOrder'),
+            		source: target.data('target'),
+            		target: target.data('source'), 
+            		StartArrow : target.data('StartArrow'),
+        			selected : target.data('Selected')
+      			},
+      			selected : false
+    		})
+    		target.remove();
+  			window.cy.add(edge);	
+		}
+		dialogEdge.dialog( "close" );
+	}
+	
+	function editNode() {
+		var name = document.getElementById("name").value;
+		var width = document.getElementById("width").value;
+		var height = document.getElementById("height").value;
 		target.data('name', name);
 		target.data('Width', width);
 		target.data('Height', height);
+		
+		var node_name = target.data("shared_name");
+		selectedForQueryNodes.push(node_name);
+		var node_id = target.data("id");
+		var count = document.getElementById("type").value;
+					
+		// RNA
+		if (count == 1) {						
+			target.addClass('green_bg');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		} 
+					
+		if (count == 2) {
+			target.removeClass('green_bg');
+			target.addClass('red_bg');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		// CNV Added
+		if (count == 3) {
+			target.addClass('purple_border');
+			target.addClass('green_bg');
+			target.removeClass('red_bg');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 4) {
+			target.addClass('purple_border');
+			target.addClass('red_bg');
+			target.removeClass('green_bg');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 5) {
+			target.addClass('red_border');
+			target.addClass('green_bg');
+			target.removeClass('red_bg');
+			target.removeClass('purple_border');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 6) {
+			target.addClass('red_border');
+			target.addClass('red_bg');
+			target.removeClass('green_bg');
+			target.removeClass('purple_border');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 7) {
+			target.addClass('red_shadow');
+			target.addClass('red_bg');
+			target.addClass('purple_border');
+						
+			target.removeClass('green_bg');
+			target.removeClass('red_border');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 8) {
+			target.addClass('red_shadow');
+			target.addClass('red_bg');
+			target.addClass('red_border');
+						
+			target.removeClass('green_bg');
+			target.removeClass('purple_border');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 9) {
+			target.addClass('red_shadow');
+			target.addClass('green_bg');
+			target.addClass('red_border');
+						
+			target.removeClass('red_bg');
+			target.removeClass('purple_border');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
+					
+		if (count == 10) {
+			target.addClass('red_shadow');
+			target.addClass('green_bg');
+			target.addClass('purple_border');
+						
+			target.removeClass('red_bg');
+			target.removeClass('red_border');
+			$('#variable').val($('#variable').val() + node_name + " ");
+		}
 		dialogNode.dialog( "close" );
 	}
 
@@ -98,7 +270,7 @@
     	height: 300,
     	width: 350,
     	buttons: {
-    		"submit": edit,
+    		"submit": editNode,
     	    Cancel: function() {
     	    	dialogNode.dialog( "close" );
     	   	}
@@ -107,5 +279,19 @@
     	}
     });
     
+    dialogEdge = $( "#dialog-form-edge" ).dialog({
+    	autoOpen: false,
+    	height: 300,
+    	width: 350,
+    	buttons: {
+    		"submit": editEdge,
+    	    Cancel: function() {
+    	    	dialogEdge.dialog( "close" );
+    	   	}
+    	},
+    	close: function() {
+    	}
+    });
+    
 </script>
 </html>