Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
diff -u -re023857e217082f46fd3235d5673129ffccf6ff4 -r1c32145e0e416293fdc892cd7a34f808866ce490
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision e023857e217082f46fd3235d5673129ffccf6ff4)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	(.../ProgressEngine.java)	(revision 1c32145e0e416293fdc892cd7a34f808866ce490)
@@ -60,7 +60,7 @@
      * result in the completion of A. Therefore, <code>completedActivityList</code>
      * will hold B and C.
      */
-    private List completedActivityList = new LinkedList();
+    private List<Long> completedActivityList = new LinkedList<Long>();
     /**
      * Method determines next step for a learner based on the activity
      * they have just completed. Will clear the Parallel Waiting Complete value if it is currently set.
@@ -88,7 +88,8 @@
                                              LearnerProgress learnerProgress) throws ProgressException 
     {
         learnerProgress.setProgressState(completedActivity,
-                                         LearnerProgress.ACTIVITY_COMPLETED);
+                                         LearnerProgress.ACTIVITY_COMPLETED,
+                                         activityDAO);
         completedActivityList.add(completedActivity.getActivityId());
         Transition transition = completedActivity.getTransitionFrom();
 
@@ -189,7 +190,7 @@
     
     /** Set the current activity as attempted. If it is a parallel activity, mark its children as attempted too. */
     private void setActivityAttempted(LearnerProgress progress, Activity activity) {
-        progress.setProgressState(activity,LearnerProgress.ACTIVITY_ATTEMPTED);
+        progress.setProgressState(activity,LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
     	activity.setReadOnly(true);
         
         if ( activity.isParallelActivity() ) {
@@ -383,4 +384,8 @@
 	public void setActivityDAO(IActivityDAO activityDAO) {
 		this.activityDAO = activityDAO;
 	}
+	
+
+
+
 }
\ No newline at end of file
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
===================================================================
diff -u -re023857e217082f46fd3235d5673129ffccf6ff4 -r1c32145e0e416293fdc892cd7a34f808866ce490
--- lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision e023857e217082f46fd3235d5673129ffccf6ff4)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(.../LearnerService.java)	(revision 1c32145e0e416293fdc892cd7a34f808866ce490)
@@ -351,7 +351,7 @@
     	activity.setReadOnly(true);
     	activityDAO.insertOrUpdate(activity);
     	
-    	progress.setProgressState(activity, LearnerProgress.ACTIVITY_ATTEMPTED);
+    	progress.setProgressState(activity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
     	progress.setCurrentActivity(activity);
     	progress.setNextActivity(activity);
     	learnerProgressDAO.saveLearnerProgress(progress);
@@ -366,10 +366,10 @@
     	LearnerProgress progress = learnerProgressDAO.getLearnerProgressByLearner(learnerId, lessonId);
     	
     	if(fromActivity != null)
-    		progress.setProgressState(fromActivity, LearnerProgress.ACTIVITY_ATTEMPTED);
+    		progress.setProgressState(fromActivity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
     	
     	if(toActivity != null) { 
-	    	progress.setProgressState(toActivity, LearnerProgress.ACTIVITY_ATTEMPTED);
+	    	progress.setProgressState(toActivity, LearnerProgress.ACTIVITY_ATTEMPTED, activityDAO);
 	    	progress.setCurrentActivity(toActivity);
 	    	progress.setNextActivity(toActivity);
     	}