--- a/model/working-copy/wd5-prov-n.html	Wed Mar 21 10:13:59 2012 +0000
+++ b/model/working-copy/wd5-prov-n.html	Wed Mar 21 10:42:41 2012 +0000
@@ -351,39 +351,50 @@
 </section>
 
 <section id="components"> 
-<h2>PROV-DM Components</h2>
+<h2>PROV-N Productions per Component</h2>
 
-<p>Instances of the PROV-DM data model are expressed in PROV-N by a text conformant with the toplevel <a>production</a> <span class="nonterminal">expression</span> of the grammar. These <span
-class="nonterminal">expression</span>s are grouped in two categories:
-<span class="nonterminal">elementExpression</span> (see section <a href="#expression-element">Element</a>) and
-<span class="nonterminal">relationExpression</span>  (see section <a href="#expression-relation">Relation</a>).</p>
-
+<p>Instances of the PROV-DM data model are expressed in PROV-N by a text conformant with the toplevel <a>production</a> <span class="nonterminal">expression</span> of the grammar. 
 
 <div class='grammar'>
-<span class="nonterminal">expression</span>&nbsp;::=  
-<span class="nonterminal">elementExpression</span> 
-| <span class="nonterminal">relationExpression</span> 
-<br/>
-<!-- -->
-<br/>
-<span class="nonterminal">elementExpression</span>&nbsp;::=  
-<span class="nonterminal">entityExpression</span> 
+<table border="0" style="background: white;">
+<tr><td><span class="nonterminal">expression</span> 
+&nbsp;::=<br/><br/><br/><br/><br/><br/></td><td>
+<!-- Component 1-->
+&nbsp;&nbsp;<span class="nonterminal">entityExpression</span> 
 | <span class="nonterminal">activityExpression</span> 
-| <span class="nonterminal">agentExpression</span>
-| <span class="nonterminal">noteExpression</span> <br/>
-<!-- -->
+| <span class="nonterminal">generationExpression</span> 
+| <span class="nonterminal">usageExpression</span> 
 <br/>
-<span class="nonterminal">relationExpression</span>&nbsp;::=  
-<span class="nonterminal">generationExpression</span> 
-| <span class="nonterminal">usageExpression</span> 
-| <span class="nonterminal">derivationExpression</span> 
-| <span class="nonterminal">activityAssociationExpression</span> 
-| <span class="nonterminal">responsibilityExpression</span> 
 | <span class="nonterminal">startExpression</span> 
 | <span class="nonterminal">endExpression</span> 
+| <span class="nonterminal">communicationExpression</span> 
+| <span class="nonterminal">startByActivityExpression</span> 
+<br/>
+<!-- Component 2-->
+| <span class="nonterminal">agentExpression</span>
+| <span class="nonterminal">attributionExpression</span> 
+| <span class="nonterminal">associationExpression</span> 
+| <span class="nonterminal">responsibilityExpression</span> 
+<br/>
+<!-- Component 3-->
+| <span class="nonterminal">derivationExpression</span> 
+| <span class="nonterminal">revisionExpression</span> 
+| <span class="nonterminal">quotationExpression</span> 
+| <span class="nonterminal">hadOriginalSourceExpression</span> 
+| <span class="nonterminal">traceabilityExpression</span> 
+<br/>
+<!-- Component 4-->
 | <span class="nonterminal">alternateExpression</span> 
 | <span class="nonterminal">specializationExpression</span>
+<br/>
+<!-- Component 5-->
+<!-- Component 6-->
+
+| <span class="nonterminal">noteExpression</span> 
 | <span class="nonterminal">annotationExpression</span> 
+<br/>
+</td></tr>
+</table>
 </div>