diff --git a/src/Templates/annotate/index.html b/src/Templates/annotate/index.html
index 089e978..22c76f4 100644
--- a/src/Templates/annotate/index.html
+++ b/src/Templates/annotate/index.html
@@ -151,5 +151,4 @@ <h4>Select Schema and Mode</h4>
 </div>
 <div id="overlapContextMenu"></div>
 <div id="propertyContextMenu"></div>
-<div id="errorMessage"><div><div>Error</div><pre></pre></div><div><div>Global Info</div><ul></ul></div><div><div>Local Info</div><ul></ul></div><div>Please contact your administrator with above information</div></div>
 {% endblock %}
diff --git a/src/Templates/base.html b/src/Templates/base.html
index 2af0cee..d919731 100644
--- a/src/Templates/base.html
+++ b/src/Templates/base.html
@@ -6,24 +6,24 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 
-{% load staticfiles %}
+{% load static %}
 <head>
 <meta http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <title>{% block title %}{{ title }}{% endblock %}</title>
 
-<link rel="SHORTCUT ICON" type="image/x-icon" href="{{ root_url }}{% static "image/anaforafavicon.png" %}" />
-<link rel="icon" type="image/x-icon" href="{{ root_url }}{% static "image/anaforafavicon.png" %}" />
+<link rel="SHORTCUT ICON" type="image/x-icon" href="{{ root_url }}{{ STATIC_URL }}anaforafavicon.png"/>
+<link rel="icon" type="image/x-icon" href="{{ root_url }}{{ STATIC_URL }}anaforafavicon.png" />
 {% for cssName in css %}
-<link rel="stylesheet" href="{{ root_url }}{% static cssName %}" type="text/css" media="screen" />
+<link rel="stylesheet" href="{{ root_url }}{{ STATIC_URL }}{{ cssName }}" type="text/css" media="screen" />
 {% endfor %}
-<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.0/jquery.min.js"></script>
+<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.8.2/jquery.min.js" type="text/javascript"></script>
 {% for jsName in js %}
-<script src="{{ root_url }}{% static jsName %}" type="text/javascript"></script>
+<script src="{{ root_url }}{{ STATIC_URL }}{{jsName}}" type="text/javascript"></script>
 {% endfor %}
 {% for schema, schemaMode in js_schemaSpecific.items %} {% ifequal schema settingVars.schema %} {% if settingVars.isAdjudication %} {% if schemaMode.adjudication %} {% for jsName in schemaMode.adjudication %}
-<script src="{{ root_url }}{% static jsName %}" type="text/javascript"></script>
+<script src="{{ root_url }}{{ STATIC_URL }}{{jsName}}" type="text/javascript"></script>
 {% endfor %} {% endif %} {% else %} {% if schemaMode.annotate %} {% for jsName in schemaMode.annotate %}
-<script src="{{ root_url }}{% static jsName %}" type="text/javascript"></script>
+<script src="{{ root_url }}{{ STATIC_URL }}{{jsName}}" type="text/javascript"></script>
 {% endfor %} {% endif %} {% endif %} {% endifequal %} {% endfor %}
 <script type="text/JavaScript">
   var _setting = {
diff --git a/src/main/annotate/projectSetting.py b/src/main/annotate/projectSetting.py
index cfa07a8..b01fb0b 100644
--- a/src/main/annotate/projectSetting.py
+++ b/src/main/annotate/projectSetting.py
@@ -47,10 +47,15 @@ def parseFromFile(self, filePath):
 					pass
 				else:
 					if mode.needPreannotation:
-						if mode.preannotationFromMode not in [tMode.name for tMode in schema.modes]:
-							raise Exception('Preannotation mode name "' + str(mode.preannotationFromMode) + '" from mode "' + mode.name + '" of schema "' + schemaName + '" is not exists')
+						if mode.preannotationFromMode.strip() == "":
+							mode.preannotationFromMode = None
+						else:
+							mode.preannotationFromMode = schema.getMode(mode.preannotationFromMode)
 
-						mode.preannotationFromMode = [tMode for tMode in schema.modes if tMode.name ==  mode.preannotationFromMode][0]
+						#if mode.preannotationFromMode not in [tMode.name for tMode in schema.modes]:
+						#	raise Exception('Preannotation mode name "' + str(mode.preannotationFromMode) + '" from mode "' + mode.name + '" of schema "' + schemaName + '" is not exists')
+
+						#mode.preannotationFromMode = [tMode for tMode in schema.modes if tMode.name ==  mode.preannotationFromMode][0]
 
 	def isSchemaExist(self, schemaName, modeName = "default"):
 		if schemaName not in self.schemaList:
diff --git a/src/main/annotate/views.py b/src/main/annotate/views.py
index 7a10e6f..4f506c7 100644
--- a/src/main/annotate/views.py
+++ b/src/main/annotate/views.py
@@ -18,9 +18,9 @@
 
 css = ["css/style.css", "css/themes/default/style.css"]
 
-js_lib = ["js/lib/" + js_file for js_file in ["jquery.jstree.js", "jquery.jstree.schema.js", "jquery.hotkeys.js", "jquery.ui.position.js", "jquery.contextMenu.js", "jquery.json-2.4.min.js", "jquery.cookie.js"]]
+js_lib = ["js/lib/" + js_file for js_file in ["jquery.jstree.js", "jquery.jstree.schema.js", "jquery.hotkeys.js", "jquery.ui.position.min.js", "jquery.contextMenu.min.js", "jquery.json-2.4.min.js", "jquery.cookie.js"]]
 
-js_annotate = ["js/annotate/" + js_file for js_file in  ["errorHandler.js", "schema.js", "anaforaProject.js", "anaforaObj.js", "annotate.js", "propertyFrame.js", "annotateFrame.js", "aObjSelectionMenu.js", "projectSelector.js", "anaforaAdjudicationProject.js", "relationFrame.js"]]
+js_annotate = ["js/annotate/" + js_file for js_file in  ["schema.js", "anaforaProject.js", "anaforaObj.js", "annotate.js", "propertyFrame.js", "annotateFrame.js", "aObjSelectionMenu.js", "projectSelector.js", "anaforaAdjudicationProject.js", "relationFrame.js"]]
 
 js_schemaSpecific = {"Coreference": {"adjudication":["js/annotate/anaforaAdjudicationProjectCoreference.js"]}}
 
@@ -311,14 +311,17 @@ def setCompleted(request, projectName, corpusName, taskName, schemaName):
 	if os.path.exists(fileName + ".inprogress.xml"):
 		subprocess.call(["mv", fileName + ".inprogress.xml", fileName + ".completed.xml"])
 		subprocess.call("sed -u -i 's/<progress>in-progress<\/progress>/<progress>completed<\/progress>/' " + fileName + ".completed.xml", shell=True)
+		#subprocess.call("sed -u -i 's/@%s/@gold/' %s.completed.xml" % (request.META["REMOTE_USER"], fileName), shell=True)
 		mode = ps.getMode(*(schemaName.replace("-Adjudication", "").split("-")))
 		if "-Adjudication" in schemaName or mode.directSetGold:
 			# set as gold
+			if mode.directSetGold:
+				subprocess.call("sed -u -i 's/@%s/@gold/' %s.completed.xml" % (request.META["REMOTE_USER"], fileName), shell=True)
 			fileNameGold = filePath + "/" + taskName + "." + schemaName.replace("-Adjudication", "") +  ".gold.completed.xml"
 			subprocess.call(["cp", fileName + ".completed.xml", fileNameGold])
 			schema = ps.getSchema(schemaName.split("-")[0])
 			for tMode in schema.modes:
-				if tMode.needPreannotation and tMode.preannotationFromMode == mode:
+				if tMode.needPreannotation and tMode.preannotationFromMode is not None and tMode.preannotationFromMode.name == mode.name:
 					fileNamePreannotation = filePath + "/" + taskName + "." + schema.name + "-" + tMode.name +  ".preannotation.completed.xml"
 					subprocess.call(["cp", fileNameGold, fileNamePreannotation])
 
diff --git a/src/main/static/css/style.css b/src/main/static/css/style.css
index 369e4bc..065277f 100644
--- a/src/main/static/css/style.css
+++ b/src/main/static/css/style.css
@@ -989,14 +989,18 @@ progress[aria-valuenow]:before  {
 	padding: 10px;
 }
 
+#schemaSelector div ul {
+	padding-left: 10px;
+}
+
 #projectSelectorWindow h5 {
 	display: none;
 	border-bottom: 1px solid #9a9a9a;
 	margin: 0px;
 }
 
-#projectSelectorWindow ul {
-	max-height: 220px;
+#projectSelector ul {
+	max-height: 300px;
 	max-width: 260px;
 
 	overflow-y: auto;
@@ -1082,35 +1086,3 @@ progress[aria-valuenow]:before  {
 	opacity: 0.6;
 	z-index: 999;
 }
-
-#errorMessage {
-	display:none;
-	background: white;
-	padding: 20px; 	
-	border: 2px solid #ddd;
-	float: left;
-	font-size: 1.2em;
-	position: fixed;
-	top: 50%; left: 50%;
-	z-index: 99999;
-	box-shadow: 0px 0px 20px #999; /* CSS3 */
-        -moz-box-shadow: 0px 0px 20px #999; /* Firefox */
-        -webkit-box-shadow: 0px 0px 20px #999; /* Safari, Chrome */
-	border-radius:3px 3px 3px 3px;
-        -moz-border-radius: 3px; /* Firefox */
-        -webkit-border-radius: 3px; /* Safari, Chrome */
-}
-
-#errorMessage > div {
-	padding-bottom: 10px;
-	border-top: 1px solid #B9B9B9;
-}
-
-#errorMessage > div > div {
-	font-weight: bold;
-}
-
-#errorMessage > div > ul, #errorMessage > div > pre {
-	max-height: 150px;
-  	overflow-y: scroll; 
-}
diff --git a/src/main/static/js/annotate/anaforaAdjudicationProject.js b/src/main/static/js/annotate/anaforaAdjudicationProject.js
index 69db7ec..3ea5761 100644
--- a/src/main/static/js/annotate/anaforaAdjudicationProject.js
+++ b/src/main/static/js/annotate/anaforaAdjudicationProject.js
@@ -31,10 +31,73 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 
 	// compare 
 	$.each(projectList, function(annotator, aProject) {
-		entityList[idx] = $.map( aProject.entityList, function(value) {return value;});
+		entityList[idx] = [];
+		$.each(aProject.entityList, function(eID, entity) {
+			var tAnnotator =  entity.id.substring(entity.id.lastIndexOf('@')+1);
+			if(tAnnotator == "gold") {
+				if(eID in _self.entityList) {
+					var originEntity = _self.entityList[eID];
+					// go through all the linkingAObj in entity, replace with originEntity
+					$.each(entity.linkingAObjList, function(ttIdx, linkingAObj) {
+						$.each(linkingAObj.type.propertyTypeList, function(tttIdx, pType) {
+							if(pType.input == InputType.LIST && linkingAObj.propertyList[tttIdx] != undefined) {
+								var pIdx = linkingAObj.propertyList[tttIdx].indexOf(entity);
+								if(pIdx > -1)
+									linkingAObj.propertyList[tttIdx][pIdx] = originEntity;
+							}
+						});
+					});
+					// move linkedAObj from entity1 to entity0
+					originEntity.linkingAObjList = originEntity.linkingAObjList.concat(entity.linkingAObjList);
+					if(_self.annotateFrame != undefined)
+						_self.annotateFrame.removeEntityPosit(originEntity, entity, true);
+				}
+				else {
+					_self.entityList[eID] = entity;
+					entity.setAdditionalData("adjudication", "gold");
+				}
+				delete _self.projectList[annotator].entityList[eID];
+			}
+			else {
+				entityList[idx].push(entity);
+			}
+		});
+		//entityList[idx] = $.map( aProject.entityList, function(value) {return value;});
 		entityList[idx].sort(Entity.sort);
 
-		relationList[idx] = $.map( aProject.relationList, function(value) {return value;});
+		relationList[idx] = [];
+		$.each(aProject.relationList, function(rID, relation) {
+			var relation = aProject.relationList[rID];
+			var tAnnotator =  relation.id.substring(relation.id.lastIndexOf('@')+1);
+			if(tAnnotator == "gold") {
+				if(rID in _self.relationList) {
+					var originRelation = _self.relationList[rID];
+					// go through all the linkingAObj in relation, replace with originRelation
+					$.each(relation.linkingAObjList, function(ttIdx, linkingAObj) {
+						$.each(linkingAObj.type.propertyTypeList, function(tttIdx, pType) {
+							if(pType.input == InputType.LIST && linkingAObj.propertyList[tttIdx] != undefined) {
+								var pIdx = linkingAObj.propertyList[tttIdx].indexOf(relation);
+								if(pIdx > -1)
+									linkingAObj.propertyList[tttIdx][pIdx] = originRelation;
+							}
+						});
+					});
+					// move linkedAObj from relation1 to relation0
+					originRelation.linkingAObjList = originRelation.linkingAObjList.concat(relation.linkingAObjList);
+					//if(_self.annotateFrame != undefined)
+					//	_self.annotateFrame.removeEntityPosit(originRelation, relation, true);
+				}
+				else {
+					_self.relationList[rID] = relation;
+					relation.setAdditionalData("adjudication", "gold");
+				}
+				delete _self.projectList[annotator].relationList[rID];
+			}
+			else {
+				relationList[idx].push(relation);
+			}
+		});
+		//relationList[idx] = $.map( aProject.relationList, function(value) {return value;});
 		relationList[idx].sort(Relation.sort);
 
 		idx++;
@@ -44,6 +107,7 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 	});
 
 	//// check the AdjuidcationEntity
+	var needAdjEntityPairList = [];
 	entityListIdx = [];
 	entityListIdx[0] = 0;
 	entityListIdx[1] = 0;
@@ -70,6 +134,7 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 			if( entityList0[ idx0 ].type === entityList1[ idx1+followIdx ].type ) {
 				entity0 = entityList[idx][ entityListIdx[idx] ];
 				entity1 = entityList[xIdx][ entityListIdx[xIdx] + followIdx ];
+					
 				term0 = entity0.id.split('@');
 				term1 = entity1.id.split('@');
 				annotator0 = term0[3];
@@ -115,27 +180,75 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 					needAddAdjudicationEntity = compareRObj.needAddAdjudicationEntity;
 					diffProp = compareRObj.diffProp;
 					spanEqual = compareRObj.spanEqual;
+					if(needAddAdjudicationEntity) 
+						needAdjEntityPairList.push([compareRObj, [entity0, entity1]]);
 				}
 
+				/*
 				if(needAddAdjudicationEntity) {
-					if(spanEqual && diffProp.length == 0 && _self.identicalEntityMarkAsGold) {
-						_self.markGold(entity0);
-						entity1.setAdditionalData("adjudication", "not gold");
+					var newAdjEntity = undefined;
+					
+					if(entity0.getAdditionalData("comparePair") != undefined || entity1.getAdditionalData("comparePair") != undefined) {
+						var hasAlignedEntity = undefined;
+						[entity1, entity0].forEach(function(tEntity) {
+
+							var comparePairList;
+							if((comparePairList = tEntity.getAdditionalData("comparePair")) != undefined) {
+								;
+								
+							}
+						});
+
+						if(entity0.getAdditionalData("comparePair") != undefined)
+							hasAlignedEntity = entity0;
+						else
+							hasAlignedEntity = entity1;
+					}
+					else {
+						if(spanEqual && diffProp.length == 0 && _self.identicalEntityMarkAsGold) {
+							_self.markGold(entity0);
+							entity1.setAdditionalData("adjudication", "not gold");
+						}
+						var newAdjEntity = new AdjudicationEntity(this.getNewEntityId(), entity0.type, [entity0, entity1], diffProp);
+						this.addAdjEntityToAdjudicationInCompareEntityPair(entity0, entity1, newAdjEntity);
+						this.addAdjEntityToAdjudicationInCompareEntityPair(entity1, entity0, newAdjEntity);
+						this.addAdjAObj(newAdjEntity);
+						if(_self.annotateFrame != undefined)
+							_self.annotateFrame.updatePosIndex(newAdjEntity);
+						_self.addTypeCount(newAdjEntity.type);
 					}
-					var newAdjEntity = new AdjudicationEntity(this.getNewEntityId(), entity0.type, [entity0, entity1], diffProp);
-					this.addAdjEntityToAdjudicationInCompareEntityPair(entity0, entity1, newAdjEntity);
-					this.addAdjEntityToAdjudicationInCompareEntityPair(entity1, entity0, newAdjEntity);
-					this.addAdjAObj(newAdjEntity);
-					if(_self.annotateFrame != undefined)
-						_self.annotateFrame.updatePosIndex(newAdjEntity);
-					_self.addTypeCount(newAdjEntity.type);
 				}
+				*/
 			}
 			followIdx++;
 		}
 		entityListIdx[idx]++;
 	}
 
+	needAdjEntityPairList.sort(function(compareList0, compareList1) { return compareList1[0].matchScore - compareList0[0].matchScore; });
+	for(comparePair of needAdjEntityPairList) {
+		var newAdjEntity = undefined;
+		var compareRObj = comparePair[0];
+		var diffProp = compareRObj.diffProp;
+		var spanEqual = compareRObj.spanEqual;
+		entity0 = comparePair[1][0];
+		entity1 = comparePair[1][1];
+
+		if(entity0.getAdditionalData("comparePair") != undefined || entity1.getAdditionalData("comparePair") != undefined)
+			continue;
+		if(spanEqual && diffProp.length == 0 && _self.identicalEntityMarkAsGold) {
+			_self.markGold(entity0);
+			entity1.setAdditionalData("adjudication", "not gold");
+		}
+		var newAdjEntity = new AdjudicationEntity(this.getNewEntityId(), entity0.type, [entity0, entity1], diffProp);
+		this.addAdjEntityToAdjudicationInCompareEntityPair(entity0, entity1, newAdjEntity);
+		this.addAdjEntityToAdjudicationInCompareEntityPair(entity1, entity0, newAdjEntity);
+		this.addAdjAObj(newAdjEntity);
+		if(_self.annotateFrame != undefined)
+			_self.annotateFrame.updatePosIndex(newAdjEntity);
+		_self.addTypeCount(newAdjEntity.type);
+	}
+
 	//// check the AdjuidcationRelation
 	
 	relationListIdx = [];
@@ -144,12 +257,31 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 	var comparePairRelationList0;
 	var comparePairRelationList1;
 
+	// Move gold relation to local relation
+	/*
+	$.each(projectList, function(annotator, aProject) {
+		$.each(aProject.relationList, function(rIdx, relation) {
+			var term = relation.id.split('@');
+			var goldAnnotator = term[3];
+			if(goldAnnotator == "gold") {
+				if(!(rIdx in _self.relationList)) {
+					_self.relationList[rIdx] = relation;
+				}
+				delete projectList[annotator].relationList[rIdx];
+			}
+		});
+	});
+	*/
+	
 	$.each(relationList[0], function(key0, relation0) {
+		term0 = relation0.id.split('@');
+		annotator0 = term0[3];
 		var currentDiffProp = relation0.type.propertyTypeList.length + 1;
+
 		$.each(relationList[1], function(key1, relation1) {
+			term1 = relation1.id.split('@');
+			annotator1 = term1[3];
 			comparePairRelationList1 = relation1.getAdditionalData("comparePair");
-			if(relation0.id == "22@r@doc0021_CLIN@ahoward" && relation1.id == "14@r@doc0021_CLIN@krwr4334")
-				console.log("160@r");
 			if(relation0.type == relation1.type) {
 
 				var diffProp = IAdjudicationAnaforaObj.compareAObjPropertyList(relation0, relation1, AnaforaAdjudicationProject.adjEntityComparePropertyFunc);
@@ -202,6 +334,7 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 				}
 			}
 		});
+		
 	});
 
 	// recount the adjudicationEntityList, typeCount, update posit index, and count the adjudication complete number
@@ -224,9 +357,9 @@ AnaforaAdjudicationProject.prototype.addAnaforaProjectList = function(projectLis
 	});
 
 	this.totalAdjudication -= Object.keys(this.adjudicationEntityList).length;
-	this.totalAdjudication -= Object.keys(this.entityList).length;
+	this.totalAdjudication += Object.keys(this.entityList).length;
 	this.totalAdjudication -= Object.keys(this.adjudicationRelationList).length;
-	this.totalAdjudication -= Object.keys(this.relationList).length;
+	this.totalAdjudication += Object.keys(this.relationList).length;
 
 
 	this.completeAdjudication += Object.keys(this.entityList).length;
@@ -622,6 +755,18 @@ AnaforaAdjudicationProject.prototype.setCompletedProcess = function() {
 				if(_self.entityList[newIdx] != undefined)
 					throw "entity idx:" + newIdx.toString() + " not empty!";
 
+				$.each(entity.type.propertyTypeList, function(idx, propType) {
+					if(propType.input == InputType.LIST) {
+						if(entity.propertyList[idx] != undefined) {
+							$.each(entity.propertyList[idx], function(aIdx, aObj) {
+								var tComparePairList = undefined;
+								if(aObj.getAdditionalData("adjudication") !== "gold" && aObj.id.split('@')[3] != "gold" && ((tComparePairList = aObj.getAdditionalData("comparePair")) !== undefined && ((tComparePairList[tComparePairList.length-1] instanceof AdjudicationEntity) || (tComparePairList[tComparePairList.length-1] instanceof AdjudicationRelation))))
+									entity.propertyList[idx][aIdx] = tComparePairList[0];
+	
+							});
+						}
+					}
+				});
 				_self.entityList[newIdx] = entity;
 
 			}
@@ -640,6 +785,19 @@ AnaforaAdjudicationProject.prototype.setCompletedProcess = function() {
 				if(_self.relationList[newIdx] != undefined)
 					throw "relation idx:" + newIdx.toString() + " not empty!";
 
+				$.each(relation.type.propertyTypeList, function(idx, propType) {
+					if(propType.input == InputType.LIST) {
+						if(relation.propertyList[idx] != undefined) {
+							$.each(relation.propertyList[idx], function(aIdx, aObj) {
+								var tComparePairList = undefined;
+								if(aObj.getAdditionalData("adjudication") !== "gold" && aObj.id.split('@')[3] != "gold" && ((tComparePairList = aObj.getAdditionalData("comparePair")) !== undefined && ((tComparePairList[tComparePairList.length-1] instanceof AdjudicationEntity) || (tComparePairList[tComparePairList.length-1] instanceof AdjudicationRelation))))
+									relation.propertyList[idx][aIdx] = tComparePairList[0];
+	
+							});
+						}
+					}
+				});
+
 				_self.relationList[newIdx] = relation;
 
 			}
@@ -649,8 +807,22 @@ AnaforaAdjudicationProject.prototype.setCompletedProcess = function() {
 
 	// adjudication entity and relation list: set the adjudication annotation to the selected gold annotation, move to the project entity and relation list; delete non-gold adjudication annotation
 	$.each(this.adjudicationEntityList, function(idx, entity) {
+		var comparePairList = undefined;
 		if(entity.decideIdx !== undefined) {
 			entity.compareAObj[entity.decideIdx].id = entity.id;
+
+			$.each(entity.type.propertyTypeList, function(idx, propType) {
+				if(propType.input == InputType.LIST) {
+					if(entity.compareAObj[entity.decideIdx].propertyList[idx] != undefined) {
+						$.each(entity.compareAObj[entity.decideIdx].propertyList[idx], function(aIdx, aObj) {
+							var comparePairList = undefined;
+							if(aObj.getAdditionalData("adjudication") !== "gold" && aObj.id.split('@')[3] != "gold" && ((comparePairList = aObj.getAdditionalData("comparePair")) !== undefined && ((comparePairList[comparePairList.length-1] instanceof AdjudicationEntity) || (comparePairList[comparePairList.length-1] instanceof AdjudicationRelation))))
+								entity.compareAObj[entity.decideIdx].propertyList[idx][aIdx] = comparePairList[0];
+
+						});
+					}
+				}
+			});
 			_self.entityList[idx] = entity.compareAObj[entity.decideIdx];
 			_self.entityList[idx].setAdditionalData("adjudication", undefined);
 			_self.entityList[idx].setAdditionalData("comparePair", undefined);
@@ -661,6 +833,18 @@ AnaforaAdjudicationProject.prototype.setCompletedProcess = function() {
 	$.each(this.adjudicationRelationList, function(idx, relation) {
 		if(relation.decideIdx !== undefined) {
 			relation.compareAObj[relation.decideIdx].id = relation.id;
+			$.each(relation.type.propertyTypeList, function(idx, propType) {
+				if(propType.input == InputType.LIST) {
+					if(relation.compareAObj[relation.decideIdx].propertyList[idx] != undefined) {
+						$.each(relation.compareAObj[relation.decideIdx].propertyList[idx], function(aIdx, aObj) {
+							var comparePairList = undefined;
+							if(aObj.getAdditionalData("adjudication") !== "gold" && aObj.id.split('@')[3] != "gold" && ((comparePairList = aObj.getAdditionalData("comparePair")) !== undefined && ((comparePairList[comparePairList.length-1] instanceof AdjudicationEntity) || (comparePairList[comparePairList.length-1] instanceof AdjudicationRelation))))
+								relation.compareAObj[relation.decideIdx].propertyList[idx][aIdx] = comparePairList[0];
+
+						});
+					}
+				}
+			});
 			_self.relationList[idx] = relation.compareAObj[relation.decideIdx];
 			_self.relationList[idx].setAdditionalData("adjudication", undefined);
 			_self.relationList[idx].setAdditionalData("comparePair", undefined);
@@ -931,7 +1115,7 @@ AnaforaAdjudicationProject.prototype.readFromXMLDOM = function(xml) {
 				}
 				else {
 					$.each(entity.type.propertyTypeList, function(pIdx, pType) {
-						if(pType.input == InputType.LIST) {
+						if(pType.input == InputType.LIST && entity.propertyList[pIdx] != undefined) {
 							$.each(entity.propertyList[pIdx], function(plIdx) {
 								if(entity.propertyList[pIdx][plIdx] instanceof EmptyEntity) {
 									var emptyEntity = entity.propertyList[pIdx][plIdx];
diff --git a/src/main/static/js/annotate/anaforaAdjudicationProjectCoreference.js b/src/main/static/js/annotate/anaforaAdjudicationProjectCoreference.js
index ab5ffbf..aedd55d 100644
--- a/src/main/static/js/annotate/anaforaAdjudicationProjectCoreference.js
+++ b/src/main/static/js/annotate/anaforaAdjudicationProjectCoreference.js
@@ -3,7 +3,6 @@ function AnaforaAdjudicationProjectCoreference(schema, task) {
 	AnaforaAdjudicationProject.call(this, schema, task);
 
 	this.identicalEntityMarkAsGold = false;
-
 }
 
 AnaforaAdjudicationProjectCoreference.prototype = new AnaforaAdjudicationProject();
@@ -121,8 +120,7 @@ AnaforaAdjudicationProjectCoreference.prototype.relationAdjFilter = function(dif
 
 Entity.coreferenceComparePairCheck = function(entity0, entity1) {
 	var needAddAdjudicationEntity = (Entity.sort(entity0, entity1) == 0);
-	return {"needAddAdjudicationEntity": needAddAdjudicationEntity, "diffProp":[], "spanEqual": needAddAdjudicationEntity};
+	return {"needAddAdjudicationEntity": needAddAdjudicationEntity, "diffProp":[], "spanEqual": needAddAdjudicationEntity, "matchScore": (needAddAdjudicationEntity ? 0.8 : 0.2) };
 }
 
-
 Entity.comparePairCheck = Entity.coreferenceComparePairCheck;
diff --git a/src/main/static/js/annotate/anaforaObj.js b/src/main/static/js/annotate/anaforaObj.js
index 48dc874..7977c70 100644
--- a/src/main/static/js/annotate/anaforaObj.js
+++ b/src/main/static/js/annotate/anaforaObj.js
@@ -7,19 +7,6 @@ Array.prototype.max = function() {
 	return Math.max.apply(null, this);
 }
 
-function InvalidAnaforaObjException(message) {
-	ErrorException.call(message);
-	this.message = message;
-	if ("captureStackTrace" in ErrorException)
-		ErrorException.captureStackTrace(this, InvalidArgumentException);
-	else
-		this.stack = (new ErrorException()).stack;
-}
-
-InvalidAnaforaObjException.prototype = Object.create(ErrorException.prototype);
-InvalidAnaforaObjException.prototype.name = "InvalidAnaforaObjException";
-InvalidAnaforaObjException.prototype.constructor = InvalidAnaforaObjException;
-
 function SpanType(start, end) {
 	this.start = start;
 	this.end = end;
@@ -101,18 +88,8 @@ SpanType.merge = function(span1, span2) {
 }
 
 function IAnaforaObj(id, type, propertyList, additionalList, comment) {
-	/*
-	 @type id:	str
-	 */
 	if(id != undefined) {
-		var idTerm = id.split("@");
-		if(idTerm.length != 4) {
-			throw new InvalidAnaforaObjException("The input ID format error: <b>" + String(id) + "</b>\nshould be <b>\'sID@e/r@Annotator@Task\'</b>");
-		}
-
 		this.id = id;
-		this.sID = parseInt(idTerm[0]);
-		
 		this.type = type;
 		this.comment = comment;
 		if(propertyList == undefined){
@@ -131,11 +108,6 @@ function IAnaforaObj(id, type, propertyList, additionalList, comment) {
 
 		this.linkingAObjList = [];
 	}
-	/*
-	else {
-		throw new InvalidAnaforaObjException("input id is undefined");
-	}
-	*/
 }
 
 IAnaforaObj.prototype.addListProperty = function(aObj, pIdx, lIdx) {
@@ -328,7 +300,7 @@ IAnaforaObj.prototype.getPropertyXMLStr = function() {
 			}
 		}
 		else {
-			rStr += '\t\t\t<' + pType.type + '>' + ((element == undefined) ? "" : String(element).replace(/&/g, '&amp;').replace(/</g, '&lt;').replace(/>/g,'&gt;').replace(/"/g, '&quot;'))  + '</' + pType.type + '>\n';
+			rStr += '\t\t\t<' + pType.type + '>' + ((element == undefined) ? "" : element)  + '</' + pType.type + '>\n';
 		}
 	})
 
@@ -395,6 +367,7 @@ function Entity(id, type, span, propertyList, additionList, comment) {
 	}
 }
 
+
 Entity.prototype = new IAnaforaObj();
 Entity.prototype.constructor = Entity;
 
@@ -451,17 +424,24 @@ Entity.sort = function(entityA,entityB) {
 }
 
 Entity.comparePairCheck = function(entity0, entity1) {
-	 
 	var spanEqual = false;
 	var needAddAdjudicationEntity = false;
 	var diffProp = IAdjudicationAnaforaObj.compareAObjPropertyList(entity0, entity1);
+	var diffPropCount = diffProp.length;
+	var matchScore = 0.0;
+	if(entity0.type.propertyTypeList.length == 0)
+		matchScore += 0.2;
+	else
+		matchScore += (0.2 * (1.0 - diffPropCount/entity0.type.propertyTypeList.length));
 	
 	if(Entity.sort(entity0, entity1) == 0) {
 		spanEqual = true;
 		needAddAdjudicationEntity = true;
+		matchScore += 0.8;
 	}
 	else {
-		diffPropCount = diffProp.length;
+		var spanIntList = Entity.calSpanUnionAndIntersec(entity0, entity1);
+		matchScore += 0.8 * spanIntList[0]/spanIntList[1];
 
 		//comparePairList0 = this.comparePairEntity[entity0];
 		var comparePairList0 = entity0.getAdditionalData("comparePair");
@@ -475,7 +455,76 @@ Entity.comparePairCheck = function(entity0, entity1) {
 				
 	}
 
-	return {"needAddAdjudicationEntity": needAddAdjudicationEntity, "diffProp": diffProp, "spanEqual": spanEqual};
+	return {"needAddAdjudicationEntity": needAddAdjudicationEntity, "diffProp": diffProp, "spanEqual": spanEqual, "matchScore": matchScore };
+}
+
+Entity.calSpanUnionAndIntersec = function(entity0, entity1) {
+	var unionLen = 0;
+	var interLen = 0;
+	var spanIdx0 = 0, spanIdx1 = 0;
+	var span0, span1;
+
+	var spanList0 = entity0.span;
+	var spanList1 = entity1.span;
+	var span0 = spanList0[0];
+	var span1 = spanList1[0];
+	var spanShift0 = 0, spanShift1 = 0 ;
+	while(span0 != undefined || span1 != undefined) {
+		if(span0 == undefined) {
+			unionLen += (span1.end - span1.start - spanShift1);
+			spanShift1 = 0;
+			span1 = spanList1[++spanIdx1];
+		}
+		else if(span1 == undefined) {
+			unionLen += (span0.end - span0.start - spanShift0);
+			spanShift0 = 0;
+			span0 = spanList0[++spanIdx0]
+		}
+		else if(span0.end <= (span1.start + spanShift1)) {
+			unionLen += (span0.end - span0.start - spanShift0);
+			spanShift0 = 0;
+			span0 = spanList0[++spanIdx0];
+		}
+		else if(span0.start >= span1.end) {
+			unionLen += (span1.end - span1.start - spanShift1);
+			spanShift1 = 0;
+			span1 = spanList1[++spanIdx1];
+		}
+		else {
+			if(span0.start + spanShift0 < span1.start + spanShift1) {
+				unionLen += (span1.start + spanShift1) - (span0.start + spanShift0);
+				spanShift0 += (span1.start + spanShift1) - (span0.start + spanShift0);
+			}
+			else if(span0.start + spanShift0 > span1.start + spanShift1) {
+				unionLen += (span0.start + spanShift0) - (span1.start + spanShift1);
+				spanShift1 += (span0.start + spanShift0) - (span1.start + spanShift1);
+			}
+
+			var minEnd = Math.min(span0.end, span1.end);
+			var sInterLen = (minEnd - span0.start - spanShift0);
+			interLen += sInterLen;
+			unionLen += sInterLen;
+
+			if(span0.end < span1.end) {
+				spanShift1 += sInterLen;
+				spanShift0 = 0;
+				span0 = spanList0[++spanIdx0];
+			}
+			else if(span0.end > span1.end) {
+				spanShift0 += sInterLen;
+				spanShift1 = 0;
+				span1 = spanList1[++spanIdx1];
+			}
+			else {
+				spanShift0 = 0;
+				spanShift1 = 0;
+				span0 = spanList0[++spanIdx0];
+				span1 = spanList1[++spanIdx1];
+			}
+		}
+	}
+
+	return [interLen, unionLen];
 }
 
 Entity.prototype.addSpan = function(newSpan) {
@@ -680,7 +729,7 @@ Relation.prototype.genElementProperty = function() {
 			try {
 				rStr += '[' + propertyType.type + ':&nbsp;'
 				if(propertyType.input == InputType.LIST) {
-					$.each(_self.propertyList[idx], function(idx, objElement) {
+					$.each(_self.propertyList[idx], function(tIdx, objElement) {
 						rStr += objElement.genElementStr() + ", ";
 					});
 					rStr = rStr.substr(0, rStr.length - 2);
diff --git a/src/main/static/js/annotate/anaforaProject.js b/src/main/static/js/annotate/anaforaProject.js
index 6386ae5..e04e3c9 100644
--- a/src/main/static/js/annotate/anaforaProject.js
+++ b/src/main/static/js/annotate/anaforaProject.js
@@ -291,39 +291,21 @@ AnaforaProject.prototype.readFromXMLDOM = function(xml, isAdjudication) {
 
 	var idx;
 	// parse annotations
-	//try {
+	$(annotationDOM).children().each( function() {
+		if (this.tagName == "entity") {
+			var entity = Entity.genFromDOM(this, _self.schema);
+			idx = parseInt(entity.id.split('@')[0]);
+			_self.entityList[idx] = entity;
 
-		$(annotationDOM).children().each( function() {
-			if (this.tagName == "entity") {
-				var entity = Entity.genFromDOM(this, _self.schema);
-				idx = parseInt(entity.id.split('@')[0]);
-				_self.entityList[idx] = entity;
-	
-				_self.addTypeCount(entity.type);
-			}
-			else if (this.tagName == "relation") {
-				var relation = Relation.genFromDOM(this, _self.schema);
-				idx = parseInt(relation.id.split('@')[0]);
-				_self.relationList[idx] = relation;
-				_self.addTypeCount(relation.type);
-			}
-		});
-	/*
-	} catch (e) {
-		if (e instanceof ErrorException) {
-			console.log("Error Exception");
-		}
-		else if(e instanceof WarningException) {
-			console.log("Warning Exception");
+			_self.addTypeCount(entity.type);
 		}
-		else if (e instanceof InvalidAnaforaObjException) {
-			console.log("InvalidAnaforaObjException");
+		else if (this.tagName == "relation") {
+			var relation = Relation.genFromDOM(this, _self.schema);
+			idx = parseInt(relation.id.split('@')[0]);
+			_self.relationList[idx] = relation;
+			_self.addTypeCount(relation.type);
 		}
-		else {
-			console.log("other exception");
-		}
-	}
-	*/
+	});
 
 	this.maxEntityIdx = Object.keys(this.entityList).max();
 	this.maxRelationIdx = Object.keys(this.relationList).max();
diff --git a/src/main/static/js/annotate/annotate.js b/src/main/static/js/annotate/annotate.js
index f39b3c2..0237d52 100644
--- a/src/main/static/js/annotate/annotate.js
+++ b/src/main/static/js/annotate/annotate.js
@@ -11,12 +11,8 @@ var editable = false;
 var propertyFrameList = [];
 var relationFrame = undefined;
 var isChanged = false;
-var errorHandler = undefined;
 
 function onLoad() {
-	// set error handler
-	errorHandler = new ErrorHandler($("#errorMessage"));
-
 	// read schemaMap in _setting
 	var tDiv = document.createElement('div');
 	tDiv.innerHTML = _setting.schemaMap;
@@ -33,7 +29,6 @@ function onLoad() {
 	// set menu
 	navMenu = $("#headerWrapper > ul");
 
-
 	// set file menu
 	var fileMenu = $(navMenu.children("li").get(0)).children("ul").children("li");
 	fileMenu.eq(0).bind("click", function() { if(getIsChanged() && window.confirm("Save Task?")) { saveFile(); } projectSelector.selectProject(); projectSelector.popup(); });
@@ -44,7 +39,6 @@ function onLoad() {
 		projectSelector.popup();
 	else
 		loadNewProject();
-
 }
 
 function confirmLeave(evt) {
@@ -105,7 +99,7 @@ function loadNewProject() {
 	editable = (_setting.annotator === _setting.remoteUser);
 
 	// load schema tree
-	//$.jstree._themes = _setting.root_url + "/static/themes/";
+	$.jstree._themes = _setting.root_url + "/static/themes/";
 
 	// load schema
 	var schemaIdx = 0;
@@ -174,11 +168,22 @@ function loadNewProject() {
 		setIsChanged(false);
 	}
 
+
 	// load anafora data
 	aProjectWrapper = $("#aProjectWrapper");
 
+	//rawText = document.getElementById("rawText").outerHTML.replace(' id="rawText"', '') ;
+	//rawText = document.getElementById("rawText").innerHTML;
+
+	//var annotatorDiv = $('<div>' + rawText + '</div>');
+	//var annotatorDiv = $("#rawText").clone().attr('id', '');
 	var annotatorDiv = $("#rawText");
+	//rawText = document.getElementById("rawText").innerHTML;
 	rawText = annotatorDiv.text();
+	//annotatorDiv.css("display", "inline");
+	//rawText = annotatorDiv.text();
+	//var annotatorDiv = $("#rawText");
+	//annotatorDiv.css("display", "inline");
 
 	if(_setting.isAdjudication) {
 		annotatorDiv.addClass("adjudicationText");
@@ -207,25 +212,8 @@ function loadNewProject() {
 				currentAProject = new AnaforaProject(schema, annotatorName, _setting.taskName);	
 			currentAProject.setAnnotateFrame(annotateFrame);
 
-			var xmlDOM;
-			try{
-				xmlDOM = $.parseXML(tXMLText[annotatorName]);
-				currentAProject.readFromXMLDOM(xmlDOM, _setting.isAdjudication);
-			}
-			catch (e) {
-				if (e instanceof ErrorException) {
-					errorHandler.handle(e, currentAProject);
-					throw e;
-				}
-				else if(e instanceof WarningException) {
-					console.log("Warning Exception");
-					console.log(e);
-				}
-				else {
-					errorHandler.handle(e);
-					throw e;
-				}
-			}
+			var xmlDOM = $.parseXML(tXMLText[annotatorName]);
+			currentAProject.readFromXMLDOM(xmlDOM, _setting.isAdjudication);
 			aProjectList.push(currentAProject);
 			if(annotatorName == "preannotation") {
 				currentAProject.completed = false;
@@ -329,8 +317,7 @@ function loadNewProject() {
 		if(currentAProject.projectList != undefined) {
 			$.each( currentAProject.projectList, function(annotator, aProject) {
 				$.each(aProject.relationList, function(key, tRelation) {
-					//if( currentAProject.comparePairRelation[tRelation] == undefined)
-					if(tRelation.getAdditionalData("comparePair") == undefined)
+					if(tRelation.getAdditionalData("comparePair") == undefined && !(key in currentAProject.relationList))
 						displayRelationList.push(tRelation);
 				});
 			});
@@ -424,7 +411,7 @@ function schemaCheckedChange(evt) {
 		checkedType.push(schema.typeDict[this.id.substring(3).replace("_SLASH_", "/")]);
 	});
 	schema.updateCheckedType(checkedType);
-	currentAProject.updateAnnotateDisplay()
+	currentAProject.updateAnnotateDisplay();
 	relationFrame.updateRelationFrameDisplay();
 }
 
@@ -714,7 +701,6 @@ function restore() {
 	}
 
 	schemaDiv.jstree("restore");
-	//currentAProject.selectAObj(currentAProject.selectedAObj);
 }
 function assignEntityToRelation(propIdx) {
 	if(currentAProject != undefined && currentAProject.selectedAObj != null) {
diff --git a/src/main/static/js/annotate/annotateFrame.js b/src/main/static/js/annotate/annotateFrame.js
index a1bdd3b..05fffb5 100644
--- a/src/main/static/js/annotate/annotateFrame.js
+++ b/src/main/static/js/annotate/annotateFrame.js
@@ -650,8 +650,7 @@ AnnotateFrame.matchAObjFromOverlap = function(aObjList, checkedType) {
 	
 	var matchedAObj = $.grep(aObjList, function(aObj) {
 		var comparePair = aObj.getAdditionalData("comparePair");
-		// (currentAProject == undefined || aObj != currentAProject.selectedAObj) &&  
-		return (propertyFrameList.length == 0 || propertyFrameList.reduce(function (p0, p1) { return p0.isAssignRelation == false && p1.isAssignRelation == false;}) || currentAProject.selectedAObj != aObj) && (checkedType == undefined || checkedType.indexOf(aObj.type) != -1) && (aObj instanceof AdjudicationEntity || aObj instanceof AdjudicationRelation || (comparePair == undefined || !(comparePair[comparePair.length-1] instanceof AdjudicationEntity || comparePair[comparePair.length-1] instanceof AdjudicationRelation)));
+		return (checkedType == undefined || checkedType.indexOf(aObj.type) != -1) && (aObj instanceof AdjudicationEntity || aObj instanceof AdjudicationRelation || (comparePair == undefined || !(comparePair[comparePair.length-1] instanceof AdjudicationEntity || comparePair[comparePair.length-1] instanceof AdjudicationRelation)));
 	});
 
 	// is assign relation in adjudication mode
diff --git a/src/main/static/js/annotate/propertyFrame.js b/src/main/static/js/annotate/propertyFrame.js
index b4bdc83..f5d9321 100644
--- a/src/main/static/js/annotate/propertyFrame.js
+++ b/src/main/static/js/annotate/propertyFrame.js
@@ -91,6 +91,8 @@ PropertyFrame.updateSpanValue = function(e) {
 	currentAProject.selectAObj(currentAProject.selectedAObj);
 	currentAProject.moveOutPreannotation(_self.displayAObj);
 	temporalSave();
+
+
 }
 
 PropertyFrame.prototype.hide = function() {
@@ -136,12 +138,15 @@ PropertyFrame.prototype.removeAObjFromProperty = function(pIdx, pListIdx) {
 			currentAProject.annotateFrame.removeEntityPosit(removeAObj, this.displayAObj);
 			if(this.displayAObj !== currentAProject.selectedAObj)
 				currentAProject.annotateFrame.removeEntityPosit(removeAObj, currentAProject.selectedAObj);
+			//currentAProject.annotateFrame.removeEntityPosit(removeAObj, currentAProject.selectedAObj);
 		}
 		else {
 			currentAProject.annotateFrame.removeRelationPosit(removeAObj, this.displayAObj);
 			if(this.displayAObj !== currentAProject.selectedAObj)
 				currentAProject.annotateFrame.removeRelationPosit(removeAObj, currentAProject.selectedAObj);
 		}
+			//currentAProject.annotateFrame.removeRelationPosit(removeAObj, currentAProject.selectedAObj);
+
 
 		currentAProject.annotateFrame.updateOverlap(removeAObj);
 
@@ -492,6 +497,8 @@ PropertyFrame.prototype.displayPropertyTable = function(entity) {
 	// this.propertyTable.children("tbody").children("tr").remove();
 	this.propertyTable.children("tbody").remove();
 	this.propertyTable.append(propertyTable);
+
+
 }
 
 PropertyFrame.prototype.generatePropertyTable = function(aObj, comparedIdx, diffProp) {
@@ -526,16 +533,23 @@ PropertyFrame.prototype.generatePropertyTableRow = function(pType, pIdx, pValue,
 		case InputType.LIST:
 			tValue += 'class="propertyAObj">';
 			if(pValue != undefined)
+				//tValue += '&nbsp;';
+			//else 
 			{
 				$.each(pValue, function(listIdx, listElement) {
+						
 					tValue += '<div class="propertySubAObj">' + PropertyFrame.generateRemoveBtn() + listElement.genElementStr() + "</div>";
+					//tValue += listElement.genElementStr() + " <br />";
 				});
+				//tValue = tValue.substr(0, tValue.length - 7);
 			}
 			tValue += '</td>';
 			break;
 		case InputType.MULTICHOICE:
 			tValue += 'class="propertyNormal propertyValue">';
 			if(pValue != undefined)
+				//tValue += '&nbsp;'
+			//else 
 			{
 				var tValueList = "";
 				$.each(pValue, function(idx) {
@@ -561,6 +575,8 @@ PropertyFrame.prototype.generatePropertyTableRow = function(pType, pIdx, pValue,
 		default:
 			tValue += 'class="propertyNormal propertyValue">';
 			if(pValue != undefined)
+				//tValue += '&nbsp;';
+			//else 
 				tValue += pValue;
 	
 			tValue += "</td>";
@@ -650,7 +666,7 @@ PropertyFrame.prototype.generatePropertyTableRow = function(pType, pIdx, pValue,
 			currentAProject.drawAObj(currentAProject.selectedAObj);
 
 			var checkedTypeList = currentAProject.selectedAObj.type.propertyTypeList[pIdx].instanceOfList;
-			schemaDiv.jstree("selectAObjList", checkedTypeList, needSchemaTempSave, [currentAProject.selectedAObj] );
+			schemaDiv.jstree("selectAObjList", checkedTypeList, needSchemaTempSave);
 			//_self.restore();
 // _self.propertyTable.children("tbody").find(".propertyValue").index(this);
 
