diff --git a/src/org/ntlab/deltaExtractor/Alias.java b/src/org/ntlab/deltaExtractor/Alias.java
index 39edc86..054ecba 100644
--- a/src/org/ntlab/deltaExtractor/Alias.java
+++ b/src/org/ntlab/deltaExtractor/Alias.java
@@ -79,6 +79,8 @@
 			stTimeStamp = occurrencePoint.getMethodExecution().getExitTime();
 		} else if (aliasType == AliasType.METHOD_INVOCATION && st instanceof MethodInvocation) {
 			stTimeStamp = ((MethodInvocation) st).getCalledMethodExecution().getExitTime();
+		} else if (aliasType == AliasType.FORMAL_PARAMETER) {
+			stTimeStamp = occurrencePoint.getMethodExecution().getEntryTime();			
 		}
 		return stTimeStamp;
 	}
diff --git a/src/org/ntlab/deltaViewer/ForwardAliasCollector.java b/src/org/ntlab/deltaViewer/ForwardAliasCollector.java
index 3df10fc..93ca42f 100644
--- a/src/org/ntlab/deltaViewer/ForwardAliasCollector.java
+++ b/src/org/ntlab/deltaViewer/ForwardAliasCollector.java
@@ -86,13 +86,13 @@
 			FieldUpdate fu = (FieldUpdate) statement;
 			if (!fu.getValueClassName().equals("---")) {
 				// Updated by a non-null value.
-				if (fu.getContainerObjId().equals(tp.getMethodExecution().getThisObjId())) {
-					Alias thisAlias = new Alias(AliasType.THIS, 0, tp.getMethodExecution().getThisObjId(), tp.duplicate());
-					addAlias(thisAlias);
-				} else {
-					Alias containerAlias = new Alias(AliasType.CONTAINER, 0, fu.getContainerObjId(), tp.duplicate());
-					addAlias(containerAlias);
-				}
+//				if (fu.getContainerObjId().equals(tp.getMethodExecution().getThisObjId())) {
+//					Alias thisAlias = new Alias(AliasType.THIS, 0, tp.getMethodExecution().getThisObjId(), tp.duplicate());
+//					addAlias(thisAlias);
+//				} else {
+//					Alias containerAlias = new Alias(AliasType.CONTAINER, 0, fu.getContainerObjId(), tp.duplicate());
+//					addAlias(containerAlias);
+//				}
 				objectCallGraph.addRelatedPoint(tp.duplicate());
 			}
 		} else if (statement instanceof ArrayCreate) {
@@ -134,9 +134,9 @@
 					if (!mi.getCalledMethodExecution().getReturnValue().getActualType().equals("void")) {
 						Alias returnAlias = new Alias(AliasType.RETURN_VALUE, 0, returnValue, mi.getCalledMethodExecution().getExitPoint());
 						addAlias(returnAlias);
+						Alias methodInvAlias = new Alias(AliasType.METHOD_INVOCATION, 0, returnValue, tp.duplicate());
+						addAlias(methodInvAlias);
 					}
-					Alias methodInvAlias = new Alias(AliasType.METHOD_INVOCATION, 0, returnValue, tp.duplicate());
-					addAlias(methodInvAlias);
 					if (methodSignature.contains("List.get(") ||
 							methodSignature.contains("Map.get(")) {
 						String returnClass = mi.getCalledMethodExecution().getReturnValue().getActualType();
diff --git a/src/org/ntlab/deltaViewer/ForwardLayout.java b/src/org/ntlab/deltaViewer/ForwardLayout.java
index 47e51a5..893535f 100644
--- a/src/org/ntlab/deltaViewer/ForwardLayout.java
+++ b/src/org/ntlab/deltaViewer/ForwardLayout.java
@@ -33,7 +33,7 @@
 
 	@Override
 	public void execute(IObjectCallGraph objectCallGraph, IAliasCollector aliasCollector, Map<String, ObjectVertex> objectToVertexMap) {
-		step = 150;
+		step = 250;
 		padding = 200;
 				
 		// Extract the reference access history.
@@ -96,7 +96,7 @@
 		}
 		
 		// Fix the all paths from the top object.
-		double width = 2;
+		double width = 1;
 		coordinatorPoint.setX(coordinatorPoint.getX() + step * width + padding);
 		double xCor = coordinatorPoint.getX();
 		double yCor = coordinatorPoint.getY();