Index: lams_central/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r4b104094f988da370a8f45cc50e1e0705ec280f8 -r7c5b98ebf40cccf88a5d7919fec15d8103c4a880
--- lams_central/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 4b104094f988da370a8f45cc50e1e0705ec280f8)
+++ lams_central/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 7c5b98ebf40cccf88a5d7919fec15d8103c4a880)
@@ -40,14 +40,13 @@
 		<c:set var="randomID">
 			<lams:generateID id="${id}"/>
 		</c:set>
-			<c:set var="passonurl_params" value="?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
+			<c:set var="passonurl_params" value="${progress}&lessonID=${id}&uniqueID=${randomID}"/>
 			<c:if test="${redirect}">
-				<c:set var="passonurl_params" value="${passonurl_params}&redirect=true"/>
+				<c:set var="passonurl_params" value="redirect=true&${passonurl_params}"/>
 			</c:if>
 			
-			<c:set var="passonurl_nojs" value="passon.swf${passonurl_params}"/>
-			<c:set var="passonurl_js" value="passon${passonurl_params}"/>
-			
+			<c:set var="passonurl_nojs" value="passon.swf?${passonurl_params}"/>
+			<c:set var="passonurl_js" value="passon?${passonurl_params}"/>
 			<script type="text/javascript">
 				AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','1','height','1','align','left','src','<c:out value="${passonurl_js}" escapeXml="false"/>','quality','high','scale','noscale','bgcolor','#FFFFFF','name','passon', 'id', 'passon', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie','<c:out value="${passonurl_js}" escapeXml="false"/>' );
 			</script>
Index: lams_learning/web/WEB-INF/tags/Passon.tag
===================================================================
diff -u -r0c6c5f6da5f100dcb69b117554414ef8eb2e27cc -r7c5b98ebf40cccf88a5d7919fec15d8103c4a880
--- lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 0c6c5f6da5f100dcb69b117554414ef8eb2e27cc)
+++ lams_learning/web/WEB-INF/tags/Passon.tag	(.../Passon.tag)	(revision 7c5b98ebf40cccf88a5d7919fec15d8103c4a880)
@@ -40,14 +40,13 @@
 		<c:set var="randomID">
 			<lams:generateID id="${id}"/>
 		</c:set>
-			<c:set var="passonurl_params" value="?${progress}&lessonID=${id}&uniqueID=${randomID}"/>
+			<c:set var="passonurl_params" value="${progress}&lessonID=${id}&uniqueID=${randomID}"/>
 			<c:if test="${redirect}">
-				<c:set var="passonurl_params" value="${passonurl_params}&redirect=true"/>
+				<c:set var="passonurl_params" value="redirect=true&${passonurl_params}"/>
 			</c:if>
 			
-			<c:set var="passonurl_nojs" value="passon.swf${passonurl_params}"/>
-			<c:set var="passonurl_js" value="passon${passonurl_params}"/>
-			
+			<c:set var="passonurl_nojs" value="passon.swf?${passonurl_params}"/>
+			<c:set var="passonurl_js" value="passon?${passonurl_params}"/>
 			<script type="text/javascript">
 				AC_FL_RunContent('classid', 'clsid:D27CDB6E-AE6D-11cf-96B8-444553540000', 'codebase','http://download.macromedia.com/pub/shockwave/cabs/flash/swflash.cab#version=6,0,47,0','width','1','height','1','align','left','src','<c:out value="${passonurl_js}" escapeXml="false"/>','quality','high','scale','noscale','bgcolor','#FFFFFF','name','passon', 'id', 'passon', 'allowscriptaccess','sameDomain', 'swliveconnect', true, 'type', 'application/x-shockwave-flash', 'pluginspage','http://www.macromedia.com/go/getflashplayer','movie','<c:out value="${passonurl_js}" escapeXml="false"/>' );
 			</script>
Index: lams_learning/web/loadToolActivity.jsp
===================================================================
diff -u -r4b104094f988da370a8f45cc50e1e0705ec280f8 -r7c5b98ebf40cccf88a5d7919fec15d8103c4a880
--- lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 4b104094f988da370a8f45cc50e1e0705ec280f8)
+++ lams_learning/web/loadToolActivity.jsp	(.../loadToolActivity.jsp)	(revision 7c5b98ebf40cccf88a5d7919fec15d8103c4a880)
@@ -52,7 +52,7 @@
 		<script language="JavaScript" type="text/JavaScript"><!--
 			// onload method call commented out as the Flash passon movie calls doRedirect
 			function redirectPage() {
-				setTimeout("doRedirect()", 500);
+				setTimeout("doRedirect()", 1000);
 			}
 			function doRedirect() {
 				var url = "<c:out value='${activityForm.activityURLs[0].url}' escapeXml="false" />";
Index: lams_learning/web/passon.swf
===================================================================
diff -u -r4b104094f988da370a8f45cc50e1e0705ec280f8 -r7c5b98ebf40cccf88a5d7919fec15d8103c4a880
Binary files differ