Index: lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
===================================================================
diff -u -r79c858a92c17ab3ca404cab4a0cf6094254e68d5 -r060c015871ff1b64dc967fc1f462aaba06de92f1
--- lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 79c858a92c17ab3ca404cab4a0cf6094254e68d5)
+++ lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java	(.../ObjectExtractor.java)	(revision 060c015871ff1b64dc967fc1f462aaba06de92f1)
@@ -170,8 +170,10 @@
 		// now process the "parts" of the learning design
 		parseActivities((Vector)table.get("activities"),learningDesign);
 		parseTransitions((Vector)table.get("transitions"),learningDesign);
-		calculateFirstActivity(WDDXProcessor.convertToInteger(table,"firstActivityUIID"),learningDesign);				
 
+		learningDesign.setFirstActivity(learningDesign.calculateFirstActivity());
+		learningDesignDAO.update(learningDesign);
+
 		return learningDesign;	
 		}
 	
@@ -205,12 +207,6 @@
 		learningDesign.setTransitions(set);
 		learningDesignDAO.update(learningDesign);
 	}
-	/**TODO This function has to be tested with real data*/
-	public void calculateFirstActivity(Integer firstID, LearningDesign design){		
-		Activity flashFirstActivity = activityDAO.getActivityByUIID(firstID,design);
-		design.setFirstActivity(flashFirstActivity);
-		learningDesignDAO.update(design);
-	}	
 	public Activity extractActivityObject(Hashtable activityDetails, LearningDesign design) throws WDDXProcessorConversionException, ObjectExtractorException {
 		
 		Integer activityTypeID = WDDXProcessor.convertToInteger(activityDetails, "activityTypeID");