Index: lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
===================================================================
diff -u -rd56929f06ad90a63082d514e6521adc175f3de27 -r606581007abbdaee5483777096f32ffac1c3e3eb
--- lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision d56929f06ad90a63082d514e6521adc175f3de27)
+++ lams_gradebook/web/WEB-INF/tlds/lams/lams.tld	(.../lams.tld)	(revision 606581007abbdaee5483777096f32ffac1c3e3eb)
@@ -11,6 +11,10 @@
    <display-name>LAMSTags</display-name>
    <description><![CDATA[LAMS custom tags]]></description>
 
+   <listener>
+      <listener-class>org.lamsfoundation.lams.web.SessionListener</listener-class>
+   </listener>
+
    <tag>
 
       <description>Output the basic URL for the current webapp. e.g. http://server/lams/tool/nb11/</description>
@@ -24,23 +28,47 @@
    </tag>
    <tag>
 
-      <description>Output a random number for the learner and passon flash movies to communicate directly.</description>
-      <display-name>generate unique ID</display-name>
+      <description>Help tag</description>
+      <display-name>Help tag</display-name>
       <icon>    
       </icon>
-      <name>generateID</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.GenerateIDTag</tag-class>
+      <name>help</name>
+      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</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>
+         <description>Help tag</description>
+         <name>module</name>
          <required>false</required>
 
            <rtexprvalue>true</rtexprvalue>
 
       </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>toolSignature</name>
+         <required>false</required>
 
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>page</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+      <attribute>
+         <description>Help tag</description>
+         <name>style</name>
+         <required>false</required>
+
+           <rtexprvalue>true</rtexprvalue>
+
+      </attribute>
+
    </tag>
    <tag>
 
@@ -143,61 +171,6 @@
    </tag>
    <tag>
 
-      <description>Help tag</description>
-      <display-name>Help tag</display-name>
-      <icon>    
-      </icon>
-      <name>help</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.HelpTag</tag-class>
-      <body-content>empty</body-content>
-
-      <attribute>
-         <description>Help tag</description>
-         <name>module</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <description>Help tag</description>
-         <name>toolSignature</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <description>Help tag</description>
-         <name>page</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-      <attribute>
-         <description>Help tag</description>
-         <name>style</name>
-         <required>false</required>
-
-           <rtexprvalue>true</rtexprvalue>
-
-      </attribute>
-
-   </tag>
-   <tag>
-
-      <description>Checks whether Flash enabled for learner</description>
-      <display-name>Checks whether Flash enabled for learner</display-name>
-      <icon>    
-      </icon>
-      <name>LearnerFlashEnabled</name>
-      <tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</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>    
@@ -300,6 +273,11 @@
 			<rtexprvalue>true</rtexprvalue>
 		</attribute>
 		<attribute>
+			<name>index</name>
+			<required>false</required>
+			<rtexprvalue>true</rtexprvalue>
+		</attribute>
+		<attribute>
 			<name>indexed</name>
 			<required>false</required>
 			<rtexprvalue>true</rtexprvalue>
@@ -452,12 +430,8 @@
    	<tag-file>
        <name>headItems</name>
        <path>/WEB-INF/tags/headItems.tag</path>
-   	</tag-file>   	
+   	</tag-file>
    	<tag-file>
-       <name>Passon</name>
-       <path>/WEB-INF/tags/Passon.tag</path>
-   	</tag-file>  
-   	<tag-file>
 	    <name>Date</name>
 		<path>/WEB-INF/tags/Date.tag</path>
    	</tag-file>  
@@ -503,15 +477,6 @@
         <rtexprvalue>true</rtexprvalue>
     </attribute>
   </tag>
-  	<tag>
-	  	<description>Checks whether Flash enabled for learner</description>
-	  	<display-name>Checks whether Flash enabled for learner</display-name>
-	 	<icon>    
-	 	</icon>
-	 	<name>LearnerFlashEnabled</name>
-	 	<tag-class>org.lamsfoundation.lams.web.tag.LearnerFlashEnabledTag</tag-class>
-	 	<body-content>empty</body-content>
- 	</tag> 
 	<tag-file>
 		<name>head</name>
 	    <path>/WEB-INF/tags/Head.tag</path>