Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as
===================================================================
diff -u -r49710cff2a87d64fb2c2cc75c9451b7cd5578cad -r716f585a4fa8ea57c2c41f47aed1e6e108feb87d
--- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 49710cff2a87d64fb2c2cc75c9451b7cd5578cad)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(.../LearnerActivity.as)	(revision 716f585a4fa8ea57c2c41f47aed1e6e108feb87d)
@@ -143,6 +143,9 @@
 	 * @return  
 	 */
 	public function refresh():Void{
+		showAssets(false);
+		learner = controller.getModel().progressData;
+		actStatus = null;
 		draw();
 	}
 	
@@ -223,6 +226,10 @@
 		controller.activityReleaseOutside(this);
 	}
 	
+	public function set progressData(a:Progress){
+		learner = a;
+	}
+	
 	public function get controller(){
 		if(app.module == 'learner'){
 			return LessonController(_controller);
Index: lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as
===================================================================
diff -u -r5f6e47f66871afd09780696c54184aecef5d51ac -r716f585a4fa8ea57c2c41f47aed1e6e108feb87d
--- lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 5f6e47f66871afd09780696c54184aecef5d51ac)
+++ lams_common/src/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(.../LearnerComplexActivity.as)	(revision 716f585a4fa8ea57c2c41f47aed1e6e108feb87d)
@@ -67,12 +67,13 @@
 	private var _locked:Boolean;
 	
 	// Only for Learner Optional Container children
-	private var learner:Object = new Object();
+	private var learner:Progress;
 	private var containerPanelHeader:MovieClip;
 	private var completed_mc:MovieClip;
 	private var current_mc:MovieClip;
 	private var todo_mc:MovieClip;
-	private var childHolder_mc:MovieClip;
+	private var childHolder_mc:MovieClip;
+	var children_mc:Array
 	//---------------------------//
 	
 	private var child_mc : MovieClip;
@@ -99,16 +100,16 @@
 	public function init () : Void
 	{
 		
-		var children_mc : Array = new Array ();
+		children_mc = new Array();
 		var childrenArray:Array;
 		
 		childActivities_mc = this;
 		_locked = false;
 		showStatus(false);
 		
-		clickTarget_mc.onPress = Proxy.create (this, localOnPress);
-		clickTarget_mc.onRelease = Proxy.create (this, localOnRelease);
-		clickTarget_mc.onReleaseOutside = Proxy.create (this, localOnReleaseOutside);
+		clickTarget_mc.onPress = Proxy.create(this, localOnPress);
+		clickTarget_mc.onRelease = Proxy.create(this, localOnRelease);
+		clickTarget_mc.onReleaseOutside = Proxy.create(this, localOnReleaseOutside);
 		
 		
 		if(_activity.activityTypeID == Activity.PARALLEL_ACTIVITY_TYPE){
@@ -165,6 +166,18 @@
 	{
 		_activity = a;
 	}
+	
+	public function refresh(){
+		showStatus(false);
+		learner = controller.getModel().progressData;
+		actStatus = null;
+		
+		for(var i=0; i<children_mc.length;i++){
+			children_mc[i].refresh();
+		}
+		
+		draw();
+	}
 	
 	private function draw (){
 		if (actStatus == null || actStatus == undefined){
@@ -210,11 +223,11 @@
 		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;
+		_visible = true;
+		
 	}
-	
-	
-	private function localOnPress ():Void{
+
+	private function localOnPress():Void{
 		this.swapDepths(this._parent.getNextHighestDepth());
 		
 		// check double-click
@@ -234,19 +247,16 @@
 	}
 	
 	
-	private function localOnRelease ():Void{
+	private function localOnRelease():Void{
 		Debugger.log ('_doubleClicking:' + _doubleClicking + ', localOnRelease:' + this, Debugger.GEN, 'localOnRelease', 'LearnerOptionalActivity');
 			if (_locked && !_doubleClicking){
-				_locked = false;
-				gotoAndStop('collapse')
-				childHolder_mc._visible = false;
-				draw ();
+				collapse();
+				controller.complexActivityRelease(this, _doubleClicking);
 				
-			}else {
-				_locked = true;
-				childHolder_mc._visible = true;
-				gotoAndStop('expand')
-				draw ();			
+			} else {
+				expand();
+				controller.complexActivityRelease(this,_doubleClicking);
+				
 			}
 	}
 	
@@ -255,6 +265,20 @@
 		Debugger.log ('localOnReleaseOutside:' + this, Debugger.GEN, 'localOnReleaseOutside', 'LearnerOptionalActivity');
 	}
 	
+	public function collapse():Void{
+		_locked = false;
+		gotoAndStop('collapse');
+		childHolder_mc._visible = false;
+		draw();
+	}
+	
+	public function expand():Void{
+		_locked = true;
+		childHolder_mc._visible = true;
+		gotoAndStop('expand')
+		draw();
+	}
+	
 	/**
 	 * return new children array
 	 * 
@@ -291,6 +315,10 @@
 	public function get activityStatus():String{
 		return actStatus;
 	}
+	
+	public function set progressData(a:Progress){
+		learner = a;
+	}
 	
 	/**
 	*
@@ -310,6 +338,12 @@
 	}
 	public function get locked():Boolean {
 		return _locked;
+	}
+	public function get activityChildren():Array {
+		return _children;
+	}
+	public function get doubleClicking():Boolean {
+		return _doubleClicking;
 	}
 	public function get panelHeight():Number {
 		return _panelHeight;