Index: lams_central/src/flash/learnerProgress_lc.fla
===================================================================
diff -u -ra932e6f4ec8fe44e9125301c627d283b2143ffe6 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
Binary files differ
Index: lams_central/src/flash/main2.as
===================================================================
diff -u -ra932e6f4ec8fe44e9125301c627d283b2143ffe6 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_central/src/flash/main2.as	(.../main2.as)	(revision a932e6f4ec8fe44e9125301c627d283b2143ffe6)
+++ lams_central/src/flash/main2.as	(.../main2.as)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -39,15 +39,15 @@
 app.main(this);
 
 //------------------------------Local connection to JSPs for progress data ------------------------------
-var recieve_lc = new LocalConnection();
+var receive_lc = new LocalConnection();
 //-------------------------------------- Functions to setProgress data, called by the LocalConnection object in learner JSPs
-recieve_lc.setProgressData = function(attempted, completed, current, lessonID) {
+receive_lc.setProgressData = function(attempted, completed, current, lessonID) {
 	Debugger.log(arguments.toString(), 'learnerProgress_lc.setProgressData');
 	app.refreshProgress(attempted, completed, current, lessonID);
 };
-var success = recieve_lc.connect("learnerProgress_lc_" + uniqueID);
+var success = receive_lc.connect("learnerProgress_lc_" + uniqueID);
+receivin_lc.close();
 
-
 //Make app listener for stage resize events
 Stage.addListener(app);
 
Index: lams_central/web/WEB-INF/lams.tld
===================================================================
diff -u -r827fef1c3da3692dc865c3ae99a92ddecfdc643b -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
+++ lams_central/web/WEB-INF/lams.tld	(.../lams.tld)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -32,6 +32,15 @@
       <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
       <body-content>empty</body-content>
 
+      <attribute>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
+         <required>true</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
@@ -55,6 +64,17 @@
    </tag>
    <tag>
 
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
+      <icon>    
+      </icon>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <body-content>empty</body-content>
+
+   </tag>
+   <tag>
+
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -73,18 +93,7 @@
       </attribute>
 
    </tag>
-   <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
-      <icon>    
-      </icon>
-      <name>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
Index: lams_central/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -re182e8855b819d6198fb714a61246f2714caee87 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_central/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision e182e8855b819d6198fb714a61246f2714caee87)
+++ lams_central/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -32,13 +32,14 @@
  %>
 <%@ tag body-content="empty" %>
 <%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:if test="${!empty progress}">
 		<c:set var="randomID">
-			<lams:generateID/>
+			<lams:generateID id="${id}"/>
 		</c:set>
-			<c:set var="passonurl" value="passon.swf?${progress}&uniqueID=${randomID}"/>
+			<c:set var="passonurl" value="passon.swf?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
 			
 			<!-- URL's used in the movie-->
 			<!-- text used in the movie-->
Index: lams_learning/web/WEB-INF/lams.tld
===================================================================
diff -u -r827fef1c3da3692dc865c3ae99a92ddecfdc643b -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision 827fef1c3da3692dc865c3ae99a92ddecfdc643b)
+++ lams_learning/web/WEB-INF/lams.tld	(.../lams.tld)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -32,6 +32,15 @@
       <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
       <body-content>empty</body-content>
 
+      <attribute>
+         <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
+         <name>id</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
@@ -55,6 +64,17 @@
    </tag>
    <tag>
 
+      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
+      <display-name>Base URL for the current web app</display-name>
+      <icon>    
+      </icon>
+      <name>WebAppURL</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
+      <body-content>empty</body-content>
+
+   </tag>
+   <tag>
+
       <description>Output stylesheet based on the user preferences.</description>
       <display-name>User's chosen stylesheet</display-name>
       <icon>    
@@ -73,18 +93,7 @@
       </attribute>
 
    </tag>
-   <tag>
 
-      <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
-      <display-name>Base URL for the current web app</display-name>
-      <icon>    
-      </icon>
-      <name>WebAppURL</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.WebAppURLTag</tag-class>
-      <body-content>empty</body-content>
-
-   </tag>
-
   	<tag>
 		<name>STRUTS-textarea</name>
 		<tagclass>org.lamsfoundation.lams.web.tag.MultiLinesTextareaTag</tagclass>
Index: lams_learning/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -re182e8855b819d6198fb714a61246f2714caee87 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision e182e8855b819d6198fb714a61246f2714caee87)
+++ lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -32,13 +32,14 @@
  %>
 <%@ tag body-content="empty" %>
 <%@ attribute name="progress" required="true" rtexprvalue="true" type="java.lang.String" %>
+<%@ attribute name="id" required="true" rtexprvalue="true" %>
 <%@ taglib uri="tags-core" prefix="c" %>
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <c:if test="${!empty progress}">
 		<c:set var="randomID">
-			<lams:generateID/>
+			<lams:generateID id="${id}"/>
 		</c:set>
-			<c:set var="passonurl" value="passon.swf?${progress}&uniqueID=${randomID}"/>
+			<c:set var="passonurl" value="passon.swf?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
 			
 			<!-- URL's used in the movie-->
 			<!-- text used in the movie-->
Index: lams_learning/web/controlFrame.jsp
===================================================================
diff -u -r5d55cdceb46cb3488947516631babe794c86da7c -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision 5d55cdceb46cb3488947516631babe794c86da7c)
+++ lams_learning/web/controlFrame.jsp	(.../controlFrame.jsp)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -33,7 +33,7 @@
 		<lams:css/>
 		<title><fmt:message key="learner.title"/></title>
 		<c:set var="randomID">
-			<lams:generateID/>
+			<lams:generateID id="${param.lessonID}"/>
 		</c:set>
 	</head>
 	<body leftmargin="0" topmargin="0" marginwidth="0" marginheight="0">
Index: lams_learning/web/lams_learner.swf
===================================================================
diff -u -ra5518e2f5e9829d7a8a846bd96aca8f73dcfc7ef -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
Binary files differ
Index: lams_learning/web/lessonComplete.jsp
===================================================================
diff -u -re182e8855b819d6198fb714a61246f2714caee87 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision e182e8855b819d6198fb714a61246f2714caee87)
+++ lams_learning/web/lessonComplete.jsp	(.../lessonComplete.jsp)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -27,7 +27,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 
 <div align="center" class="mainHeader"> 
- 	<lams:Passon progress="${activityForm.progressSummary}"/>
+ 	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}"/>
  
     <p class="heading"><fmt:message key="message.lesson.finished" /></p>
     <p class="body"><fmt:message key="message.lesson.finishedCont" /></p>
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -re182e8855b819d6198fb714a61246f2714caee87 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision e182e8855b819d6198fb714a61246f2714caee87)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -39,7 +39,7 @@
 %>
 <body bgcolor="#9DC5EC">
 
-	<lams:Passon progress="${activityForm.progressSummary}"/>
+	<lams:Passon id="${activityForm.lessonID}" progress="${activityForm.progressSummary}"/>
 	
 	<c:if test="${!empty activityForm.activityURLs}">
 		
Index: lams_learning/web/main.jsp
===================================================================
diff -u -r440554bb4a9a414c6e3e676a93de72de3298951c -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/main.jsp	(.../main.jsp)	(revision 440554bb4a9a414c6e3e676a93de72de3298951c)
+++ lams_learning/web/main.jsp	(.../main.jsp)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -27,7 +27,7 @@
 <%@ taglib uri="tags-lams" prefix="lams" %>
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Frameset//EN" "http://www.w3.org/TR/html4/frameset.dtd">
 <html:html locale="true" xhtml="true">
-
+	
 	<head>
 		<meta http-equiv="content-type" content="text/html; charset=UTF-8">
 		<lams:css/>
Index: lams_learning/web/optionsActivity.jsp
===================================================================
diff -u -r7da79aec2f320705164e3faae07352a54d1de68a -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
--- lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision 7da79aec2f320705164e3faae07352a54d1de68a)
+++ lams_learning/web/optionsActivity.jsp	(.../optionsActivity.jsp)	(revision d52b0a9ea260d27335a647fc2fba615c8e2e228e)
@@ -56,7 +56,7 @@
 		//-->
 	</script>
 	
-	<lams:Passon progress="${optionsActivityForm.progressSummary}"/>
+	<lams:Passon id="${optionsActivityForm.lessonID}" progress="${optionsActivityForm.progressSummary}"/>
 	
 		<html:form action="/ChooseActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
@@ -160,7 +160,7 @@
 	</html:form>
 	<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="activityID" value="<c:out value="${optionsActivityForm.activityId}" />" />
 	</html:form>
 </div>
 
Index: lams_learning/web/passon.swf
===================================================================
diff -u -r77e9fde2b3fa30d4d2aed24ef304f07e5edc5381 -rd52b0a9ea260d27335a647fc2fba615c8e2e228e
Binary files differ