Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
===================================================================
diff -u -r8e4fc8d67f4733b5b989e9baf079daa75832193d -r691459c3a8be6d76fa38516c01f9bb1e0add7e86
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as	(.../Application.as)	(revision 8e4fc8d67f4733b5b989e9baf079daa75832193d)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as	(.../Application.as)	(revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86)
@@ -92,8 +92,7 @@
     private static var _instance:Application = null;     
 	private var _container_mc:MovieClip;               //Main container
 	private var _tooltipContainer_mc:MovieClip;        //Tooltip container
-    private var _debugDialog:MovieClip;                //Reference to the debug dialog
-
+    private var _debugDialog:MovieClip;                //Reference to the debug dialog
 
 	/**
     * Application - Constructor
@@ -105,8 +104,7 @@
 		_headerLoaded = false;
 		_scratchpadLoaded = false;
 		
-		_module = Application.MODULE;
- 
+		_module = Application.MODULE;
     }
     
 	/**
@@ -115,7 +113,8 @@
     public static function getInstance():Application{
         if(Application._instance == null){
             Application._instance = new Application();
-        }
+        }
+		
         return Application._instance;
     }
 
@@ -138,7 +137,6 @@
         //Assign the config load event to
         _config.addEventListener('load',Delegate.create(this,configLoaded));
         
-		
 		Key.addListener(this);
 
     }
@@ -165,14 +163,13 @@
         _dictionary = Dictionary.getInstance();
         _dictionary.addEventListener('load',Delegate.create(this,onDictionaryLoad));
 		_dictionary.load(language);
-        
 		
-		
         //Set reference to StyleManager and load Themes and setup load handler.
         var theme:String = String(_config.getItem('theme'));
         _themeManager = ThemeManager.getInstance();
         _themeManager.addEventListener('load',Delegate.create(this,onThemeLoad));
         _themeManager.loadTheme(theme);
+		
 		Debugger.getInstance().crashDumpSeverityLevel = Number(_config.getItem('crashDumpSeverityLevelLog'));
 		Debugger.getInstance().severityLevel = Number(_config.getItem('severityLevelLog')); 
 		
@@ -193,13 +190,10 @@
 				
 				setupUI();
 				checkUILoaded();
-				
         
 			} else if(_dataLoadCheckCount >= DATA_LOAD_CHECK_TIMEOUT_COUNT) {
 				Debugger.log('reached timeout waiting for data to load.',Debugger.CRITICAL,'checkDataLoaded','Application');
 				clearInterval(_DataLoadCheckIntervalID);
-				
-        
 			}
 		}
 	}
@@ -314,8 +308,6 @@
 		Header(_header_mc).resize(w);
 		
 		_lesson.setSize(w,h-(LESSON_Y+_lesson.model.getSpadHeight()));
-		//Property Inspector
-		//_pi_mc.setSize(w-_toolkit.width,_pi_mc._height)
 		_scratchpad_mc._y = h - _lesson.model.getSpadHeight();
 		
 	}
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -r691459c3a8be6d76fa38516c01f9bb1e0add7e86
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	(.../Lesson.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as	(.../Lesson.as)	(revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86)
@@ -185,11 +185,9 @@
 		lessonModel.setActive();
 		getURL(_root.serverURL + 'learning'+String(pkt)+'?lessonID='+lessonModel.getLessonID(),'contentFrame');
 		
-		
 		// check was successful join
 		getFlashProgress();
 		
-		
 	}  
 	
 	public function moveToActivity(fromAct, toAct){
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as
===================================================================
diff -u -re7c09cb004a9982fc2e56acda769e7a5df38b8b2 -r691459c3a8be6d76fa38516c01f9bb1e0add7e86
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	(.../LessonModel.as)	(revision e7c09cb004a9982fc2e56acda769e7a5df38b8b2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	(.../LessonModel.as)	(revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86)
@@ -307,7 +307,7 @@
 		return _active;
 	}
 	
-	private function orderDesign(activity:Activity, order:Array):Void{
+	private function orderDesign(activity:Activity, order:Array):Boolean{
 		Debugger.log("order design activity: " + activity.title, Debugger.CRITICAL, "orderDesign", "LessonModel");
 		
 		order.push(activity);
@@ -321,9 +321,11 @@
 			for(var i=0; i<children.length; i++) {
 				Debugger.log("progress: " + Progress.compareProgressData(_progressData, children[i].activityID), Debugger.CRITICAL, "orderDesign", "LessonModel");
 				var _progress:String = Progress.compareProgressData(_progressData, children[i].activityID);
-				if((_progress == "attempted_mc" || _progress == "completed_mc") && children[i].isSequenceActivity())
-					orderDesign(Activity(learningDesignModel.activities.get(SequenceActivity(children[i]).firstActivityUIID)), order);
-			
+				if((_progress == "attempted_mc" || _progress == "completed_mc") && children[i].isSequenceActivity()) {
+					if(_root.mode != 'preview') order.pop();
+					if(!orderDesign(Activity(learningDesignModel.activities.get(SequenceActivity(children[i]).firstActivityUIID)), order)) return false;
+					if(children[i].stopAfterActivity) return false;
+				}
 			}
 		}
 		
@@ -333,14 +335,16 @@
 			
 				if (ddmTransition.fromUIID == activity.activityUIID){
 					var ddm_activity:Activity = learningDesignModel.activities.get(ddmTransition.toUIID);
-					orderDesign(ddm_activity, order);
+					if(!orderDesign(ddm_activity, order)) return false;
 				}
 				
 		}
 		
+		return true;
+		
 	}
 	
-	private function setDesignOrder(){
+	private function setDesignOrder():Array {
 		ddmActivity_keys = learningDesignModel.activities.keys();
 		ddmTransition_keys = learningDesignModel.transitions.keys();
 		
@@ -356,31 +360,15 @@
 		
 	}
 	
-	/**
-	private function getDesignToInsert():Object {
-		// check if Sequence Activity (Branching Activity child) is current activity
-		var insertObject = new Object();
-		insertObject.array = new Array();
-		insertObject.parent = null;
-		
-		var currentActivity:Activity = _learningDesignModel.getActivityByUIID(getActivityUIID(_progressData.getCurrentActivityId()));
-		
-		Debugger.log("current id: " + _progressData.getCurrentActivityId(), Debugger.CRITICAL, "getDesignToInsert", "LessonModel");
-		Debugger.log("currentActivity: " + currentActivity.activityUIID, Debugger.CRITICAL, "getDesignToInsert", "LessonModel");
-		
-		if(currentActivity.parentUIID != null) {
-			
-			insertObject.parent = _learningDesignModel.getActivityByUIID(currentActivity.parentUIID);
-			Debugger.log("parentActivity: " + insertObject.parent.title, Debugger.CRITICAL, "getDesignToInsert", "LessonModel");
-		
-			if(currentActivity.isSequenceActivity()) {
-				orderDesign(currentActivity, insertObject.array);
-			}
-		}
-		
-		return insertObject;
+	public function getDesignOrder(firstActivityUIID):Array {
+		var orderedActivityArr:Array = new Array();
+		var learnerFirstActivity:Activity = learningDesignModel.activities.get(firstActivityUIID);
+
+		// recursive method to order design
+		orderDesign(learnerFirstActivity, orderedActivityArr);
+		return orderedActivityArr;
 	}
-	*/
+	
 	public function setCurrentActivityOpen(ca:Object){
 		
 		if(_currentActivityOpen != null && ca != null){
@@ -411,9 +399,6 @@
 	public function drawDesign(){
 		var indexArray:Array = setDesignOrder();
 		
-		//var insertObject:Object = getDesignToInsert(indexArray);
-		//Debugger.log("insert Object array length: " + insertObject.array.length, Debugger.CRITICAL, "updateDesign", "LessonModel");
-		
 		//go through the design and get the activities and transitions 
 		var dataObj:Object;
 		ddmActivity_keys = learningDesignModel.activities.keys();
@@ -427,7 +412,6 @@
 			if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0) {
 				if(_learningDesignModel.getActivityByUIID(ddm_activity.parentUIID).isSequenceActivity())
 					broadcastViewUpdate("DRAW_ACTIVITY", ddm_activity);
-					return;
 			} else {
 				broadcastViewUpdate("DRAW_ACTIVITY",ddm_activity);
 			}
@@ -438,8 +422,11 @@
 	public function updateDesign(){
 		var indexArray:Array = setDesignOrder();
 		
-		if(indexArray.length > activitiesDisplayed.length) {
-			removeAllActivities(indexArray);
+		Debugger.log("indexArray length: " + indexArray.length, Debugger.CRITICAL, "updateDesign", "LessonModel");
+		Debugger.log("activitiesDisplayed length: " + activitiesDisplayed.size(), Debugger.CRITICAL, "updateDesign", "LessonModel");
+		
+		if(indexArray.length > activitiesDisplayed.size()) {
+			broadcastViewUpdate("REMOVE_ACTIVITY_ALL");
 		}
 		
 		//go through the design and get the activities and transitions 
@@ -457,19 +444,12 @@
 			if(ddm_activity.parentActivityID > 0 || ddm_activity.parentUIID > 0){
 				if(_learningDesignModel.getActivityByUIID(ddm_activity.parentUIID).isSequenceActivity())
 					broadcastViewUpdate("UPDATE_ACTIVITY",ddm_activity);
-				return;
 			} else {
 				broadcastViewUpdate("UPDATE_ACTIVITY",ddm_activity);
 			}
 		}
 	}
 	
-	private function removeAllActivities(indexArray:Array):Void {
-		for(var i=0; i < indexArray.length; i++) {
-			broadcastViewUpdate("REMOVE_ACTIVITY", _learningDesignModel.getActivityByUIID(indexArray[i].activityUIID));
-		}
-	}
-	
 	public function broadcastViewUpdate(updateType, data){
 		setChanged();
 		
Index: lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as
===================================================================
diff -u -re7c09cb004a9982fc2e56acda769e7a5df38b8b2 -r691459c3a8be6d76fa38516c01f9bb1e0add7e86
--- lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision e7c09cb004a9982fc2e56acda769e7a5df38b8b2)
+++ lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as	(.../LessonView.as)	(revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86)
@@ -70,14 +70,12 @@
 	private var ACT_X:Number = -20;
 	private static var ACT_X_OFFSET:Number = 65;
 	private var ACT_Y:Number = 32.5;
-	
 	
 	//These are defined so that the compiler can 'see' the events that are added at runtime by EventDispatcher
     private var dispatchEvent:Function;     
     public var addEventListener:Function;
     public var removeEventListener:Function;    
 
-
 	/**
 	* Constructor
 	*/
@@ -151,21 +149,21 @@
 			case 'REMOVE_ACTIVITY' :
 				removeActivity(infoObj.data, lm);
 				break;
+			case 'REMOVE_ACTIVITY_ALL' :
+				removeAll(lm);
+				break;
 			case 'LESSON' :
-				trace('setting lesson name');
 				setLessonName(lm.name);
 				Application.getInstance().getHeader().showExportButton(lm.learnerExportAvailable);
 				break;
 			case 'DESIGNMODEL' :
-				trace('updating design model for lesson..');
 				lm.getLesson().finishedDesign = true;
 				break;
 			case 'PROGRESS' :
 				Debugger.log('progress data receieved for user..' + lm.progressData.getUserName(),Debugger.CRITICAL,'update','org.lamsfoundation.lams.LessonView');
 				break;
 			case 'PROGRESS_UPDATE' :
 				Debugger.log('progress data receieved for user..' + lm.progressData.getUserName(),Debugger.CRITICAL,'update','org.lamsfoundation.lams.LessonView');
-				//removeAll(lm);
 				lm.updateDesign();
 				break;
 			case 'CLOSE_COMPLEX_ACTIVITY' :
@@ -181,6 +179,7 @@
 		if (lessonName.length > LESSON_NAME_LENGTH_LIMIT){
 			lessonName = lessonName.substr(0, LESSON_NAME_LENGTH_LIMIT)+STRING_CONT;
 		}
+		
 		Application.getInstance().getHeader().setLessonName(lessonName);
 	}
 	
@@ -199,7 +198,9 @@
 		
 	}
 	
-	private function removeAll(lm:LessonModel){
+	public function removeAll(lm:LessonModel){
+		Debugger.log("removin all", Debugger.CRITICAL, "removeAll", "LessonView");
+		
 		var keys = lm.activitiesDisplayed.keys();
 		for(var i=0; i<keys.length; i++){
 			var r = lm.activitiesDisplayed.remove(keys[i]);
@@ -249,23 +250,22 @@
 			activityTitle = activityTitle.substr(0,ACT_TITLE_LENGTH_LIMIT) + STRING_CONT;
 		}
 		
-		
 		//take action depending on act type
-		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity() || a.isBranchingActivity()) {
+		if(a.activityTypeID==Activity.TOOL_ACTIVITY_TYPE || a.isGroupActivity() || (a.isBranchingActivity() && _root.mode != 'preview')){
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is tool/gate/group/branching activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		} else if(a.isGateActivity()){
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerGateActivity", "LearnerGateActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
-		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE){
+		} else if(a.activityTypeID==Activity.PARALLEL_ACTIVITY_TYPE || a.activityTypeID==Activity.OPTIONAL_ACTIVITY_TYPE ||  (a.isBranchingActivity() && _root.mode == 'preview')){
 			//get the children
 			var children:Array = lm.learningDesignModel.getComplexActivityChildren(a.activityUIID);
 			Debugger.log('The activity:'+a.title+','+a.activityTypeID+' is is parellel (complex) activity',Debugger.CRITICAL,'drawActivity','LessonView');
 		
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerComplexActivity", "LearnerComplexActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_children:children,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, learner:lm.progressData});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
-		}else if(a != null){
+		} else if(a != null){
 			Debugger.log('The activity:'+a.title+','+a.activityUIID+' is of unknown type, drawing default icon',Debugger.CRITICAL,'drawActivity','LessonView');
 			newActivity_mc = _activityLayer_mc.attachMovie("LearnerActivity", "LearnerActivity" + a.activityID, _activityLayer_mc.getNextHighestDepth(),{_activity:a,_controller:lc,_view:lv, _x:(progress_scp._width/2)-ACT_X_OFFSET, _y:ACT_Y, actLabel:activityTitle, learner:lm.progressData, _complex:false});
 			ACT_Y = newActivity_mc._y + ACTIVITY_OFFSET;
@@ -307,9 +307,6 @@
 			drawActivity(a, lm);
 		}
 		
-		
-		
-		
 		return true;
 	}
 
@@ -380,7 +377,6 @@
         var s:Object = lm.getSize();
         
 		//Size panel
-		trace('lesson view  setting width to '+s.w);
 		bkg_pnl.setSize(s.w,s.h);
 		progress_scp.setSize(s.w, s.h-progress_scp._y)
 	}
@@ -413,7 +409,8 @@
 	*/
 	public function getModel():LessonModel{
 			return LessonModel(model);
-	}
+	}
+	
 	/**
 	 * Overrides method in abstract view to ensure cortect type of controller is returned
 	 * @usage   
@@ -422,7 +419,8 @@
 	public function getController():LessonController{
 		var c:Controller = super.getController();
 		return LessonController(c);
-	}
+	}
+	
 	/*
     * Returns the default controller for this view.
     */
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -r9aab591f71aa913ad9b848d8cd406728c171470b -r691459c3a8be6d76fa38516c01f9bb1e0add7e86
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 9aab591f71aa913ad9b848d8cd406728c171470b)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86)
@@ -66,6 +66,7 @@
 	private var _isSelected:Boolean;
 	private var app:ApplicationParent;
 	private var _tip:ToolTip;
+	
 	//locals
 	private var tooltipTitle:String;
 	private var actStatus:String;
@@ -89,6 +90,9 @@
 	private var _base_mc:MovieClip;
 	private var _selected_mc:MovieClip;
 	
+	private var _line_bottom:MovieClip;
+	private var _line_top:MovieClip;
+	
 	private var _complex:Boolean;
 	
 	function LearnerActivity(){
@@ -102,10 +106,11 @@
 		if(_activity.isGateActivity()){
 			_visibleHeight = LearnerActivity.GATE_ACTIVITY_HEIGHT;
 			_visibleWidth = LearnerActivity.GATE_ACTIVITY_WIDTH;
-		}else if(_activity.isGroupActivity() || _activity.isBranchingActivity()) {
+		} else if(_activity.isGroupActivity() || _activity.isBranchingActivity()) {
 			_visibleHeight = LearnerActivity.TOOL_ACTIVITY_HEIGHT;
 			_visibleWidth = LearnerActivity.TOOL_ACTIVITY_WIDTH;
 		}
+		
 		//_base_mc = this;
 		//call init if we have passed in the _activity as an initObj in the attach movie,
 		//otherwise wait as the class outside will call it
@@ -379,5 +384,26 @@
 	
 	public function get learnerName():String{
 		return learner.getFullName();
-	}
+	}
+	
+	public function set lineTopVisible(a:Boolean):Void {
+		_line_top._visible = a;
+	}
+	
+	public function set lineBottomVisible(a:Boolean):Void {
+		_line_bottom._visible = a;
+	}
+	
+	public function get isCurrent():Boolean {
+		return (actStatus == 'current_mc');
+	}
+	
+	public function get isCompleted():Boolean {
+		return (actStatus == 'completed_mc');
+	}
+	
+	public function get isAttempted():Boolean {
+		return (actStatus == 'attempted_mc');
+	}
+	
 }
\ No newline at end of file
Index: lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
diff -u -r5ffdfb896de13994030991c7634bb54a7c862404 -r691459c3a8be6d76fa38516c01f9bb1e0add7e86
--- lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 5ffdfb896de13994030991c7634bb54a7c862404)
+++ lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 691459c3a8be6d76fa38516c01f9bb1e0add7e86)
@@ -26,9 +26,11 @@
 import org.lamsfoundation.lams.common.ui.*;
 import org.lamsfoundation.lams.common.mvc.*;
 import org.lamsfoundation.lams.authoring.Activity;
+import org.lamsfoundation.lams.authoring.SequenceActivity;
 import org.lamsfoundation.lams.authoring.DesignDataModel;
 import org.lamsfoundation.lams.authoring.cv.ICanvasActivity;
 import org.lamsfoundation.lams.learner.ls.LessonController;
+import org.lamsfoundation.lams.learner.Application;
 import org.lamsfoundation.lams.monitoring.mv.MonitorController;
 import org.lamsfoundation.lams.common.style. *;
 import mx.controls. *;
@@ -81,40 +83,45 @@
 	var children_mc:Array
 	//---------------------------//
 	
-	private var child_mc : MovieClip;
-	private var _visibleHeight : Number;
-	private var _visibleWidth : Number;
+	private var child_mc:MovieClip;
+	private var _visibleHeight:Number;
+	private var _visibleWidth:Number;
 	
-	private var _tm : ThemeManager;
-	private var _ddm : DesignDataModel;
+	private var _tm:ThemeManager;
+	private var _ddm:DesignDataModel;
 	private var app:ApplicationParent;
+	
+	private var activeSequence:SequenceActivity;
 	
-	function LearnerComplexActivity ()
-	{
-		complexActivity_mc = this
-		_ddm = new DesignDataModel ();
+	function LearnerComplexActivity () {
+		complexActivity_mc = this;
+		activeSequence = null;
+		
+		_ddm = new DesignDataModel();
 		app = ApplicationParent.getInstance();
+	
 		_visible = false;
+		
 		_tm = ThemeManager.getInstance ();
 		_tip = new ToolTip();
 		_visibleHeight = container_pnl._height;
 		_visibleWidth = container_pnl._width;
 		
-		MovieClipUtils.doLater (Proxy.create (this, init));
+		MovieClipUtils.doLater(Proxy.create (this, init));
 	}
 	
-	public function init () : Void
-	{
+	public function init():Void {
 		var styleObj = _tm.getStyleObject('smallLabel');
 		title_lbl = labelHolder_mc.attachMovie("Label", "actTitle", this.getNextHighestDepth(), {_width:LABEL_W, _height:LABEL_H, autoSize:"center", styleName:styleObj});
 		
-
 		children_mc = new Array();
 		var childrenArray:Array;
 		
 		childActivities_mc = this;
+		
 		_locked = false;
 		showStatus(false);
+		
 		clickTarget_mc.onRollOver = Proxy.create(this, localOnRollOver);
 		clickTarget_mc.onRollOut = Proxy.create(this, localOnRollOut);
 		clickTarget_mc.onPress = Proxy.create(this, localOnPress);
@@ -125,78 +132,135 @@
 		if(_activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
 			if(_children[0].orderID < _children[1].orderID){
 				childrenArray = orderParallelActivities(_children[0],_children[1]);
-			}else{
+			} else {
 				childrenArray = orderParallelActivities(_children[1],_children[0]);
 			}
 		} else {
 			childrenArray = _children;
 		}
-		var childCoordY = 0
-		for (var i = 0; i < childrenArray.length; i ++)
-		{
-			var progStatus:String = Progress.compareProgressData(learner, childrenArray[i].activityID);
+		
+		drawChildren(childrenArray, children_mc);
+		checkIfSequenceActive();
+		
+		childHolder_mc._visible = false;
+		
+		MovieClipUtils.doLater(Proxy.create(this, draw));
+	}
+	
+	private function drawChildren(children:Array, container:Array):Void {
+		var childCoordY=0;
+		
+		for(var i=0; i<children.length; i++) {
+			var progStatus:String = Progress.compareProgressData(learner, children[i].activityID);
 			
-			children_mc [i] = childHolder_mc.attachMovie("LearnerActivity_forComplex", "LearnerActivity_forComplex"+i, childHolder_mc.getNextHighestDepth(), {_activity:childrenArray[i], _controller:_controller, _view:_view, learner:learner, actStatus:progStatus, _complex:true, xPos:this._x, yPos:childCoordY});
-			Debugger.log('attaching child movieL ' + children_mc[i],Debugger.CRITICAL,'init','LearnerComplexActivity');
-        
-			//set the positioning co-ords
-			children_mc [i]._y = (i*21);
-			childCoordY = this._y + ((i+1)*21)+29 ;
-			children_mc [i]._visible = true;
-			
+			container[i] = childHolder_mc.attachMovie("LearnerActivity_forComplex", "LearnerActivity_forComplex"+i, childHolder_mc.getNextHighestDepth(), {_activity:children[i], _controller:_controller, _view:_view, learner:learner, actStatus:progStatus, _complex:true, xPos:this._x, yPos:childCoordY});
+			Debugger.log('attaching child movieL ' + container[i],Debugger.CRITICAL,'drawChildren','LearnerComplexActivity');
+        
+			var parentAct:Activity = Application(app).getLesson().model.learningDesignModel.getActivityByUIID(Activity(children[i]).parentUIID);
+			
+			//set the positioning co-ords
+			container[i]._y = (i*21);
+			childCoordY = this._y + ((i+1)*21)+29 ;
+			container[i]._visible = true;
+			
+			if(activity.isBranchingActivity() && parentAct.isSequenceActivity()) {
+				/** TODO: Use for Sequence in Optional */
+				container[i].lineTopVisible = (i != 0) ? false : true;
+				container[i].lineBottomVisible = (i == children.length-1) ? true : false;
+			}
 		}
 		
-		childHolder_mc._visible = false;
-		
-		MovieClipUtils.doLater (Proxy.create (this, draw));
 	}
 	
-	private function showStatus(isVisible:Boolean){
+	private function showStatus(isVisible:Boolean) {
 		completed_mc._visible = isVisible;
 		current_mc._visible = isVisible;
 		attempted_mc._visible = isVisible;
 		todo_mc._visible = isVisible;
-		
 	}
 	
-	public function get activity () : Activity
-	{
-		return getActivity ();
+	public function get activity():Activity {
+		return getActivity();
 	}
 	
-	public function set activity (a : Activity)
-	{
-		setActivity (a);
+	public function set activity(a:Activity) {
+		setActivity(a);
 	}
 	
-	public function getActivity () : Activity
-	{
+	public function getActivity():Activity {
 		return _activity;
 	}
 	
-	public function setActivity (a : Activity)
-	{
+	public function setActivity(a:Activity) {
 		_activity = a;
 	}
 	
-	public function refresh(){
+	public function refresh() {
 		showStatus(false);
 		learner = controller.getModel().progressData;
 		actStatus = null;
 		
-		for(var i=0; i<children_mc.length;i++){
+		checkIfSequenceActive();
+		
+		draw();
+	}
+	
+	/** TODO: Use for Sequence in Optional */
+	private function checkIfSequenceActive():Void {
+		/**for(var i=0; i<_children.length; i++) {
+			if(_children[i] == activeSequence
+				&& Progress.compareProgressData(learner, _children[i].activityID) == 'completed_mc')
+				
+		}*/
+		
+		for(var i=0; i<children_mc.length; i++) {
 			children_mc[i].refresh();
+	
+			/**if(activity.isBranchingActivity() 
+				&& children_mc[i].activity.isSequenceActivity() 
+				&& (children_mc[i].isAttempted || children_mc[i].isCompleted)) 
+				removeAllChildrenAndInputSequence(SequenceActivity(children_mc[i].activity));*/
+		
 		}
+	}
+	
+	private function removeAllChildren():Void {
+		for(var i=0; i<children_mc.length;i++){
+			children_mc[i].removeMovieClip();
+		}
+	}
+	
+	/** TODO: Use for Sequence in Optional */
+	private function removeAllChildrenAndLoadSequences(activity:Activity):Void {
+		activeSequence = null;
+		children_mc = new Array();
 		
-		draw();
+		removeAllChildren();
+		drawChildren(_children, children_mc);
+		
+		MovieClipUtils.doLater(Proxy.create(this, draw));
 	}
 	
+	/** TODO: Use for Sequence in Optional */
+	private function removeAllChildrenAndInputSequence(activity:SequenceActivity):Void {
+		activeSequence = activity;
+		children_mc = new Array();
+		
+		var actOrder:Array = Application(app).getLesson().model.getDesignOrder(activity.firstActivityUIID);
+		
+		removeAllChildren();
+		drawChildren(actOrder, children_mc);
+		
+		MovieClipUtils.doLater(Proxy.create(this, draw));
+	}
+	
 	private function hasCurrentChild(){
 		for(var i=0; i<children_mc.length;i++){
-			if(children_mc[i].activityStatus == 'current_mc'){
+			if(children_mc[i].isCurrent){
 				return true;
 			}
 		}
+		
 		return false;
 	}
 	
@@ -214,43 +278,31 @@
 				current_mc._visible = true;
                 break;
             case 'attempted_mc' :
-			if(_root.mode == 'preview'){  
-				if(hasCurrentChild()){current_mc._visible = true; } 
-				else { attempted_mc._visible = true; } }
-			else {current_mc._visible = true; }
+				if(_root.mode == 'preview'){  
+					if(hasCurrentChild()) { current_mc._visible = true; } 
+					else { attempted_mc._visible = true; } }
+				else { current_mc._visible = true; }
                 break;
 			default :
-				todo_mc._visible = true;
-                //Debugger.log('unknown update type :' + infoObj.updateType,Debugger.CRITICAL,'update','org.lamsfoundation.lams.MonitorView');
+				todo_mc._visible = true;
 		}
 		
-		var numOfChildren = _children.length;
+		var numOfChildren:Number = children_mc.length;
 		panelHeight = CHILD_OFFSET_Y + (numOfChildren * CHILD_INCRE);
 
 		//write text
-		//if(_activity.title != undefined){
 		toolTitle = _activity.title
 		if (toolTitle.length > 19){
 			toolTitle = toolTitle.substr(0, 17)+"..."
-		}
-		//} 
-		//else {
-			//if(_activity.activityTypeID == Activity.OPTIONAL_ACTIVITY_TYPE){
-				//title_lbl.text = 'Optional Activities';
-				//containerPanelHeader.title_lbl.text = 'Optional Activities';
-			//} else {
-				//title_lbl.text = 'Parallel Activities';
-				//containerPanelHeader.title_lbl.text = 'Parallel Activities';
-			//}
-		//}
+		}
+		
 		title_lbl.text = toolTitle;
 		containerPanelHeader.title_lbl.text = toolTitle;
-		container_pnl.setStyle ("backgroundColor", 0x4289FF);
+		container_pnl.setStyle("backgroundColor", 0x4289FF);
 		
 		//position the container (this)
-		container_pnl._height = 16+(numOfChildren * 21);
+		container_pnl._height = 16 + (numOfChildren * 21);
 		
-		Debugger.log ("I am in Draw :" + _activity.title + 'uiID:' + _activity.activityUIID + ' children:' + _children.length, Debugger.GEN, 'Draw', 'LearnerOptionalActivity');
 		_visible = true;
 		
 	}
@@ -260,12 +312,13 @@
 		var Xpos = appData.compX+ this._x - 10;
 		var Ypos = appData.compY+( (this._y+btnObj._height)-4);
 		var ttHolder = appData.ttHolder;
-		trace("x pos: "+Xpos+" and y pos: "+Ypos+" and tt holder is: "+ttHolder)
+		
 		if (btnTT == undefined || btnTT == null || btnTT == "" || btnTT == "undefined"){
 			var ttMessage = "<b>"+ _activity.title+"</b>"
 		}else {
 			var ttMessage = "<b>"+ _activity.title+"</b> \n"+Dictionary.getValue(btnTT);
 		}
+		
 		var ttWidth = 140;
 		_tip.DisplayToolTip(ttHolder, ttMessage, Xpos, Ypos, undefined, ttWidth);
 		
@@ -276,41 +329,44 @@
 	}
 	
 	private function localOnRollOver(){
-		if (actStatus == "completed_mc"){
+		if(isCompleted){
 			showToolTip(this.clickTarget_mc, "completed_act_tooltip");
-		}else if (actStatus == "current_mc"){
+		} else if(isCurrent){
 			showToolTip(this.clickTarget_mc, "current_act_tooltip");
-		}else if (actStatus == "attempted_mc"){
+		} else if(isAttempted){
 			showToolTip(this.clickTarget_mc, "current_act_tooltip");
-		}else {
-			if (String(_activity.title).length > 19){
+		} else {
+			if(String(_activity.title).length > 19){
 				showToolTip(this.clickTarget_mc, "undefined");
 			}
 		}
 		
 	}
 	
 	private function localOnRollOut(){
-		
 		hideToolTip();
 	}
 
 	private function localOnPress():Void{
 		hideToolTip();
+		
 		this.swapDepths(this._parent.getNextHighestDepth());
 		// check double-click
+		
 		var now : Number = new Date ().getTime ();
 		if ((now - _dcStartTime) <= Config.DOUBLE_CLICK_DELAY)	{
 			Debugger.log ('DoubleClicking:' + this, Debugger.GEN, 'localOnPress', 'LearnerOptionalActivity');
 			_doubleClicking = true;
+			
 			//if we double click on the glass mask - then open the container to allow the usr to see the activities inside.
 			draw ();
 			controller.activityDoubleClick(this);
 		
-		}else {
+		} else {
 			Debugger.log ('SingleClicking:+' + this, Debugger.GEN, 'localOnPress', 'LearnerOptionalActivity');
 			_doubleClicking = false;
-		}
+		}
+		
 		_dcStartTime = now;
 	}
 	
@@ -319,12 +375,10 @@
 		Debugger.log ('_doubleClicking:' + _doubleClicking + ', localOnRelease:' + this, Debugger.GEN, 'localOnRelease', 'LearnerOptionalActivity');
 			if (_locked && !_doubleClicking){
 				collapse();
-				controller.complexActivityRelease(this, _doubleClicking);
-				
+				controller.complexActivityRelease(this, _doubleClicking);
 			} else {
 				expand();
-				controller.complexActivityRelease(this,_doubleClicking);
-				
+				controller.complexActivityRelease(this,_doubleClicking);
 			}
 	}
 	
@@ -420,7 +474,20 @@
 	public function get panelHeight():Number {
 		return _panelHeight;
 	}
+	
 	public function setSelected(isSelected) {
+	
+	}
+	
+	public function get isCurrent():Boolean {
+		return (actStatus == 'current_mc');
+	}
+	
+	public function get isCompleted():Boolean {
+		return (actStatus == 'completed_mc');
+	}
+	
+	public function get isAttempted():Boolean {
+		return (actStatus == 'attempted_mc');
 	}
-
 }