diff --git a/src/org/ntlab/deltaViewer/CollaborationViewer.java b/src/org/ntlab/deltaViewer/CollaborationViewer.java
index 1db4730..a4978e8 100644
--- a/src/org/ntlab/deltaViewer/CollaborationViewer.java
+++ b/src/org/ntlab/deltaViewer/CollaborationViewer.java
@@ -112,7 +112,7 @@
 					}
 				}
 				doAnimation(curFrame, numFrame);
-			} else if (curFrameAlias != null && numFrameAlias == null) {
+			} else if (curFrameAlias != null && numFrameAlias == null && curFrameAlias.getTimeStamp() < relatedPoints.get(relatedPoints.size() - 1).getStatement().getTimeStamp()) {
 				System.out.println("\r\nLast Animation.");
 				doLastAnimation(numFrame, relatedPoints.get(relatedPoints.size() - 1));	
 			} else {
diff --git a/src/org/ntlab/deltaViewer/MagnetRONViewer.java b/src/org/ntlab/deltaViewer/MagnetRONViewer.java
index 2c28c86..550e7d2 100644
--- a/src/org/ntlab/deltaViewer/MagnetRONViewer.java
+++ b/src/org/ntlab/deltaViewer/MagnetRONViewer.java
@@ -81,6 +81,13 @@
 	public mxGraphComponent getGraphComponent() {
 		return mxgraphComponent;
 	}
+	
+	public void clear() {
+		objectToVertexMap.clear();
+		methodExecToVertexMap.clear();
+		edgeMap.clear();
+		mxgraph.removeCells(mxgraph.getSelectionModel().getCells(), false);
+	}
 
 	abstract public void initAnimation();
 
diff --git a/traces/ArgoUML.magnet b/traces/ArgoUML.magnet
index f42cc9b..c03f2f4 100644
--- a/traces/ArgoUML.magnet
+++ b/traces/ArgoUML.magnet
@@ -44,6 +44,18 @@
           }, 
           "type": "Container-Component(Collection)",
           "order": "0"
+        },
+        {
+          "src": {
+            "class": "org.argouml.uml.diagram.static_structure.ui.SelectionClass",
+            "id": "1672744985"
+          }, 
+          "dst": {
+            "class": "org.argouml.uml.diagram.static_structure.ui.FigClass",
+            "id": "1675174935"
+          }, 
+          "type": "Container-Component",
+          "order": "0"
         }
       ]
     }
diff --git a/traces/JHotDraw.magnet b/traces/JHotDraw.magnet
index c913b1e..ca10024 100644
--- a/traces/JHotDraw.magnet
+++ b/traces/JHotDraw.magnet
@@ -68,6 +68,18 @@
           }, 
           "type": "Container-Component(Collection)", 
           "order": "0"
+        },
+        {
+          "src": {
+            "class": "org.jhotdraw.draw.tool.DefaultDragTracker",
+            "id": "758826749"
+          }, 
+          "dst": {
+            "class": "org.jhotdraw.draw.DefaultDrawingEditor",
+            "id": "1859859960"
+          }, 
+          "type": "Container-Component", 
+          "order": "3"
         }
       ]
     }