diff --git a/format-master.xml b/format-master.xml
index 8b8770e..6c82fc8 100755
--- a/format-master.xml
+++ b/format-master.xml
@@ -549,10 +549,10 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="/document/@class = 'tutorial'">
-					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:when test="/document/@class = 'laboratory'">
-					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:otherwise>
 					<H1><xsl:apply-templates/></H1>
@@ -561,6 +561,7 @@
 		</html>
 	</template>
 
+	<!-- New template for tutorials and labs, which are essentially chapters when included in a course book, but are marked up as documents in themselves. -->
 	<template name="chapter-title" match="document/title" mode="chapter">
 		<latex>
 			<xsl:apply-templates/>
@@ -568,10 +569,10 @@
 		<html>
 			<xsl:choose>
 				<xsl:when test="/document/@class = 'tutorial'">
-					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Tutorial <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:when test="/document/@class = 'laboratory'">
-					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
+					<H1><xsl:call-template name="PaperCode"/> Lab <xsl:value-of select="/document/@sequence-number|//metadata/number"/><xsl:if test="$showanswers='yes'"> Sample Answers</xsl:if>: <BR/><xsl:apply-templates/></H1>
 				</xsl:when>
 				<xsl:otherwise>
 					<H1><xsl:apply-templates/></H1>
@@ -686,6 +687,8 @@
 		Anything inside a <metadata> is ignored completely. (More
 		accurately, we pick bits out of it manually as required; it's
 		only ignored by apply-templates.)
+
+		If we move to using attributes of "document" for all metadata, this will become redundant.
 	-->
 	<template name="metadata" match="metadata"/>
 	
@@ -1197,10 +1200,32 @@
 				<!-- Could possibly change this to test="/document/@class = 'tutorial'" or similar? -->
 				<!-- Sounds nicer...I think ideally the XSL processor would automatically figure out the path to the graphics based on the path to the source XML file.  Can this be done? -->
 				<xsl:when test="name(/child::node()[1])='tutorial' or /document/@class = 'tutorial'">
-					<xsl:text>\tutroot/</xsl:text><xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/><xsl:text>/Graphics</xsl:text>
+					<xsl:text>\tutroot/</xsl:text>
+					<!-- Phasing in new metadata-as-attributes approach: -->
+					<xsl:choose>
+						<!-- New style: use attributes: -->
+						<xsl:when test="/document/@sequence-number">
+							<!-- Note: support for format-number() is poor/nonexistent in Xalan, unless you build it (and Xerces) with the ICU package.  Which you can't do using Cygwin. :^( -->
+							<!-- Xalan also seems to require numbers to be written with a decimal point, otherwise it treats them as text. -->
+							<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/>
+						</xsl:when>
+						<!-- Old style: sub-elements of "metadata": -->
+						<xsl:when test="//metadata/number-code">
+							<xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/>
+						</xsl:when>
+					</xsl:choose>
+					<xsl:text>/Graphics</xsl:text>			
 				</xsl:when>
 				<xsl:when test="name(/child::node()[1])='laboratory' or /document/@class = 'laboratory'">
-					<xsl:text>\labroot/</xsl:text><xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/><xsl:text>/Graphics</xsl:text>
+					<xsl:text>\labroot/</xsl:text>
+					<xsl:choose>
+						<xsl:when test="/document/@sequence-number">
+							<xsl:value-of select="format-number(/document/@sequence-number, '00')"/><xsl:text>-</xsl:text><xsl:value-of select="/document/@title-code"/><xsl:text>/Graphics</xsl:text>
+						</xsl:when>
+						<xsl:when test="//metadata/number-code">
+							<xsl:value-of select="//metadata/number-code"/><xsl:text>-</xsl:text><xsl:value-of select="//metadata/title-code"/><xsl:text>/Graphics</xsl:text>
+						</xsl:when>
+					</xsl:choose>
 				</xsl:when>
 				<!-- Allow the author to specify a non-standard image location on the fly. -->
 				<xsl:when test="count(location) != 0">
