Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java
===================================================================
--- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java	(revision 1698)
+++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/alignment/matrix/ObjectDistanceSubstitionMatrix.java	(revision 1699)
@@ -48,9 +48,7 @@
 	}
 
+	//TODO: Merge this with updateEventTaskInstances
 	private void searchEventTaskInstances() {
-		int count = 0;
 		for (Iterator<ITask> it = uniqueTasks.iterator(); it.hasNext();) {
-			count++;
-			
 			ITask task = it.next();
 			if (!(task instanceof IEventTask)) {
@@ -62,5 +60,17 @@
 			}
 		}
-
+	}
+	
+	public void updateEventTaskInstances(LinkedList<ITask> newTasks){
+		for (Iterator<ITask> it = newTasks.iterator();it.hasNext();) {
+			ITask task = it.next();
+			if (!(task instanceof IEventTask)) {
+				EventTaskInstancesListGenerator etlg = new EventTaskInstancesListGenerator();
+				task.accept(etlg);
+				LinkedList<IEventTaskInstance> eventTaskInstances = etlg
+						.getEventlist();
+				etisOfTasks.put(task.getId(), eventTaskInstances);
+			}
+		}
 	}
 	
@@ -70,5 +80,5 @@
 		if (this.calculateNonTaskInstances) {
 			Console.traceln(Level.INFO, "searching EventTasks in Tasks");
-			searchEventTaskInstances();
+			this.updateEventTaskInstances(newTasks);
 		}
 		
@@ -200,4 +210,5 @@
 		if (this.calculateNonTaskInstances) {
 			float tmpDistance = 0;
+			//System.out.println(etisOfTasks);
 			LinkedList<IEventTaskInstance> eventTaskInstances = etisOfTasks
 					.get(task1.getId());
Index: /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java
===================================================================
--- /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java	(revision 1698)
+++ /branches/autoquest-core-tasktrees-alignment/src/main/java/de/ugoe/cs/autoquest/tasktrees/temporalrelation/RuleUtils.java	(revision 1699)
@@ -120,6 +120,6 @@
 			}
 			ITask tempTask = model.getChildren().get(modelindex);
-			//System.out.println("Trying to add " + parent.get(startIndex)
-			//	+ " to the model instance " + tempTask.getType());
+			System.out.println("Trying to add " + parent.get(startIndex)
+				+ " to the model instance " + tempTask);
 			if (tempTask.getType() == "optionality") {