Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -rccccff2318819288a061a94de8565e1e7bdb0bf7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision 08950e1090443c3423a3d1c587416a2fccd8bbdf)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision ccccff2318819288a061a94de8565e1e7bdb0bf7)
@@ -241,8 +241,10 @@
             }
             //recurvisely call back to calculateProgress to calculate completed
             //parent activity.
-            else
+            else {
+    	        learnerProgress.setPreviousActivity(complexParent);
                 calculateProgress(learner, parent, learnerProgress);
+            }
         }
         //lesson is meant to be completed if there is no transition and no parent.
         else {
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
===================================================================
diff -u -rf3e61ae90d8b2e951ff3d0fda1185720e839c8e3 -rccccff2318819288a061a94de8565e1e7bdb0bf7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java	(.../ChooseActivityAction.java)	(revision f3e61ae90d8b2e951ff3d0fda1185720e839c8e3)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java	(.../ChooseActivityAction.java)	(revision ccccff2318819288a061a94de8565e1e7bdb0bf7)
@@ -33,7 +33,6 @@
 import org.lamsfoundation.lams.learning.service.ICoreLearnerService;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
-import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 import org.lamsfoundation.lams.lesson.Lesson;
@@ -88,16 +87,8 @@
 
 		// need to do the choose first as the chooseActivity changes the progress details 
 		setupProgressString(actionForm, request);
-		
-		ActivityForm activityForm = (ActivityForm) actionForm;
-		ActionForward forward = null;
-		
-		if(activityForm.getInFrame())
-			// escape child frame and open url in parent frame
-			forward = actionMappings.getRedirectForward(progress, true);
-		else
-			forward = actionMappings.getActivityForward(activity, progress, true);
-		
+
+		ActionForward forward = actionMappings.getActivityForward(activity, progress, true);
 		return forward;
 	}
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
===================================================================
diff -u -re17801350a2c5490a2a47f6adccc87901bd8a9cb -rccccff2318819288a061a94de8565e1e7bdb0bf7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision e17801350a2c5490a2a47f6adccc87901bd8a9cb)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java	(.../CompleteActivityAction.java)	(revision ccccff2318819288a061a94de8565e1e7bdb0bf7)
@@ -34,7 +34,6 @@
 import org.lamsfoundation.lams.learning.service.LearnerServiceException;
 import org.lamsfoundation.lams.learning.web.util.ActivityMapping;
 import org.lamsfoundation.lams.learning.web.util.LearningWebUtil;
-import org.lamsfoundation.lams.learning.web.form.ActivityForm;
 import org.lamsfoundation.lams.learningdesign.Activity;
 import org.lamsfoundation.lams.lesson.LearnerProgress;
 
@@ -95,16 +94,9 @@
 		
 		// need to do the calculateProgress first as the chooseActivity changes the progress details 
 		setupProgressString(actionForm, request);
+
+		ActionForward forward = actionMappings.getProgressForward(progress,true,request, learnerService);
 		
-		ActivityForm activityForm = (ActivityForm) actionForm;
-		ActionForward forward = null;
-		
-		if(activityForm.getInFrame())
-			// escape child frame and open url in parent frame
-			forward = actionMappings.getRedirectForward(progress, true);
-		else
-			forward = actionMappings.getProgressForward(progress,true,request, learnerService);
-		
 		return forward;
 	}
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
diff -u -rf3e61ae90d8b2e951ff3d0fda1185720e839c8e3 -rccccff2318819288a061a94de8565e1e7bdb0bf7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(.../DisplayOptionsActivityAction.java)	(revision f3e61ae90d8b2e951ff3d0fda1185720e839c8e3)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	(.../DisplayOptionsActivityAction.java)	(revision ccccff2318819288a061a94de8565e1e7bdb0bf7)
@@ -118,11 +118,6 @@
 		setupProgressString(form, request);
 
 		String forward = "displayOptions";
-	
-		// set frame flag if last run activity was Parallel Activity
-		if(learnerProgress.getCurrentActivity().isParallelActivity())
-			form.setInFrame(true);
-		
 		return mapping.findForward(forward);
 	}
 	
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
===================================================================
diff -u -rf3e61ae90d8b2e951ff3d0fda1185720e839c8e3 -rccccff2318819288a061a94de8565e1e7bdb0bf7
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	(.../ActivityForm.java)	(revision f3e61ae90d8b2e951ff3d0fda1185720e839c8e3)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	(.../ActivityForm.java)	(revision ccccff2318819288a061a94de8565e1e7bdb0bf7)
@@ -56,8 +56,6 @@
 	/** Lesson to which this activity belongs. Id comes from the learner progress */
 	private Long lessonID;
 	
-	private boolean inFrame;
-	
 	/** 
 	 * Method reset
 	 * @param mapping
@@ -103,11 +101,4 @@
 		this.lessonID = lessonID;
 	}
 	
-	public boolean getInFrame() {
-		return inFrame;
-	}
-	
-	public void setInFrame(boolean inFrame) {
-		this.inFrame = inFrame;
-	}
 }
\ No newline at end of file
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -re17801350a2c5490a2a47f6adccc87901bd8a9cb -rccccff2318819288a061a94de8565e1e7bdb0bf7
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision e17801350a2c5490a2a47f6adccc87901bd8a9cb)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision ccccff2318819288a061a94de8565e1e7bdb0bf7)
@@ -57,7 +57,6 @@
 	
 	<html:form action="/ChooseActivity" method="POST">
 	<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
-	<input type="hidden" name="inFrame" value="<c:out value="${optionsActivityForm.inFrame}" />" />
 	
 	<div id="content">
 
@@ -117,7 +116,6 @@
 	<html:form action="/CompleteActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
 		<input type="hidden" name="activityID" value="<c:out value="${optionsActivityForm.activityID}" />" />
-		<input type="hidden" name="inFrame" value="<c:out value="${optionsActivityForm.inFrame}" />" />
 		
 	</html:form>