--- a/model/prov-constraints.html	Thu May 31 10:53:27 2012 +0100
+++ b/model/prov-constraints.html	Thu May 31 10:56:45 2012 +0100
@@ -468,43 +468,8 @@
 
 </section>
 
-<section >
-<h3>Component 2: Agents</h3>
-
-Attribution identifies an agent as responsible for an entity.  An
-agent can only be responsible for an entity if it was associated with
-an activity that generated the entity.  If the activity, generation
-and association events are not explicit in the instance, they can
-be inferred.
-<div class='inference' id='attribution-implication'>
-<span class='conditional'>IF</span>
-<span class="name">wasAttributedTo(e,ag)</span> holds for some identifiers
-<span class="name">e</span> and <span class="name">ag</span>,  
-<span class='conditional'>THEN</span> there exists an activity with some identifier <span class="name">a</span> such that the following statements hold:
-<pre>
-activity(a, -, -,-)
-wasGeneratedBy(-; e, a, -, -)
-wasAssociatedWith(-; a, ag, -, -)
-</pre>
-</div>
-
-<p> Responsibility relates agents where one agent acts on behalf of
-another, in the context of some activity.  The supervising agent
-delegates some responsibility for part of the activity to the
-subordinate agent, while retaining some responsibility for the overall
-activity.  </p>
-
-
-<div class="note">
-  @@TODO: Could this be an inference? Does it imply that
-  a1 is associated with all activities a2 is associated with?
-  </div>
-
-
-</section>
-
  <section> 
-<h3>Component 3: Derivations</h3>
+<h3>Component 2: Derivations</h3>
 
 
  <p>Derivations with an explicit activity and no usage admit the
@@ -549,7 +514,7 @@
 
   
 
-
+<!--
 
 <p>A revision admits the following inference, linking the two entities
   by a derivation, and stating them to be alternates.</p>
@@ -564,7 +529,9 @@
 wasAttributedTo(e2,ag)
 </pre>
 </div>
-
+-->
+
+<!--
 <div class="note">
   The following doesn't make sense because wasRevisionOf and
   wasDerivedFrom have different types.
@@ -593,6 +560,41 @@
 
 <p>
 
+-->
+</section>
+
+
+<section >
+<h3>Component 3: Agents</h3>
+
+Attribution identifies an agent as responsible for an entity.  An
+agent can only be responsible for an entity if it was associated with
+an activity that generated the entity.  If the activity, generation
+and association events are not explicit in the instance, they can
+be inferred.
+<div class='inference' id='attribution-implication'>
+<span class='conditional'>IF</span>
+<span class="name">wasAttributedTo(e,ag)</span> holds for some identifiers
+<span class="name">e</span> and <span class="name">ag</span>,  
+<span class='conditional'>THEN</span> there exists an activity with some identifier <span class="name">a</span> such that the following statements hold:
+<pre>
+activity(a, -, -,-)
+wasGeneratedBy(-; e, a, -, -)
+wasAssociatedWith(-; a, ag, -, -)
+</pre>
+</div>
+
+<p> Responsibility relates agents where one agent acts on behalf of
+another, in the context of some activity.  The supervising agent
+delegates some responsibility for part of the activity to the
+subordinate agent, while retaining some responsibility for the overall
+activity.  </p>
+
+
+<div class="note">
+  @@TODO: Could this be an inference? Does it imply that
+  a1 is associated with all activities a2 is associated with?
+  </div>
 
 
 <p>Traceability allows an entity to be transitively linked to another entity it is derived from, to an agent it is attributed to, or another agent having some responsibility, or a trigger of an activity that generated it.</p>
@@ -637,9 +639,11 @@
 </p>
 
 
+
 </section>
 
 
+
  <section> 
 <h3>Component 4: Alternate Entities</h3>
 <div class="note">TODO: There is currently no consensus what inferences on