diff --git a/resources/sql/youyesyet.postgres.sql b/resources/sql/youyesyet.postgres.sql
index e6e4bc4..d50afd7 100644
--- a/resources/sql/youyesyet.postgres.sql
+++ b/resources/sql/youyesyet.postgres.sql
@@ -5,7 +5,7 @@
 --	
 --	auto-generated by [Application Description Language framework] 
 --	
---	(https://github.com/simon-brooke/adl) at 20180718T215811.044Z 
+--	(https://github.com/simon-brooke/adl) at 20180721T111020.637Z 
 --	
 --	A web-app intended to be used by canvassers
 --	  campaigning for a 'Yes' vote in the second independence
@@ -72,7 +72,7 @@ CREATE TABLE addresses
 (
 	 id SERIAL NOT NULL PRIMARY KEY,
 	 address VARCHAR(256) NOT NULL,
-	 postcode VARCHAR(16) CONSTRAINT pattern_14 CHECK (postcode ~* '^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$'),
+	 postcode VARCHAR(16) CONSTRAINT pattern_7470 CHECK (postcode ~* '^([Gg][Ii][Rr] 0[Aa]{2})|((([A-Za-z][0-9]{1,2})|(([A-Za-z][A-Ha-hJ-Yj-y][0-9]{1,2})|(([AZa-z][0-9][A-Za-z])|([A-Za-z][A-Ha-hJ-Yj-y][0-9]?[A-Za-z]))))[0-9][A-Za-z]{2})$'),
 	 phone VARCHAR(16),
 	 district_id INTEGER,
 	 latitude DOUBLE PRECISION,
@@ -985,33 +985,31 @@ ALTER TABLE ln_roles_canvassers_roles ADD CONSTRAINT ri_ln_roles_canvassers_role
 	ON DELETE NO ACTION ;
 
 ------------------------------------------------------------------------
---	link table joining events with teams 
+--	link table joining roles with canvassers 
 ------------------------------------------------------------------------
-CREATE TABLE ln_teams_events_teams
+CREATE TABLE ln_members_roles_canvassers
 (
-	 event_id INTEGER,
-	 team_id INTEGER
+	 role_id INTEGER,
+	 canvasser_id INTEGER
 );
-GRANT SELECT ON ln_teams_events_teams TO admin,
+GRANT SELECT ON ln_members_roles_canvassers TO admin,
 	analysts,
 	canvassers,
 	issueeditors,
 	issueexperts,
 	teamorganisers ;
-GRANT INSERT ON ln_teams_events_teams TO admin,
-	teamorganisers ;
-GRANT UPDATE ON ln_teams_events_teams TO admin,
-	teamorganisers ;
-GRANT DELETE ON ln_teams_events_teams TO admin ;
+GRANT INSERT ON ln_members_roles_canvassers TO admin ;
+GRANT UPDATE ON ln_members_roles_canvassers TO admin ;
+GRANT DELETE ON ln_members_roles_canvassers TO admin ;
 
-ALTER TABLE ln_teams_events_teams ADD CONSTRAINT ri_ln_teams_events_teams_events_event_id 
-	FOREIGN KEY( event_id ) 
-	REFERENCES events(id) 
+ALTER TABLE ln_members_roles_canvassers ADD CONSTRAINT ri_ln_members_roles_canvassers_canvassers_canvasser_id 
+	FOREIGN KEY( canvasser_id ) 
+	REFERENCES canvassers(id) 
 	ON DELETE NO ACTION ;
 
-ALTER TABLE ln_teams_events_teams ADD CONSTRAINT ri_ln_teams_events_teams_teams_team_id 
-	FOREIGN KEY( team_id ) 
-	REFERENCES teams(id) 
+ALTER TABLE ln_members_roles_canvassers ADD CONSTRAINT ri_ln_members_roles_canvassers_roles_role_id 
+	FOREIGN KEY( role_id ) 
+	REFERENCES roles(id) 
 	ON DELETE NO ACTION ;
 
 ------------------------------------------------------------------------
diff --git a/youyesyet.canonical.adl.xml b/youyesyet.canonical.adl.xml
index 26f3e9f..fb58539 100644
--- a/youyesyet.canonical.adl.xml
+++ b/youyesyet.canonical.adl.xml
@@ -1,8 +1,9 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <!-- DOCTYPE application PUBLIC "-//JOURNEYMAN//DTD ADL 1.4.1//EN"
-"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" -->
-<application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/" xmlns:html="http://www.w3.org/1999/xhtml" xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/" name="youyesyet" version="0.1.1">
-  <!--
+"http://www.journeyman.cc/adl/stable/adl/schemas/adl-1.4.1.dtd" --><application xmlns="http://bowyer.journeyman.cc/adl/1.4.1/"
+             xmlns:html="http://www.w3.org/1999/xhtml"
+             xmlns:adl="http://bowyer.journeyman.cc/adl/1.4.1/"
+             name="youyesyet"
+             version="0.1.1"><!--
     ***************************************************************************
     *
     *   Application Description Language Framework
@@ -31,8 +32,8 @@
     section 3</documentation>
     <help locale="en_GB.UTF-8">A valid postcode.</help>
   </typedef>
-  <group name="public">
-    <documentation>All users</documentation>
+   <group name="public">
+      <documentation>All users</documentation>
   </group>
   <group name="canvassers" parent="public">
     <documentation>All users of the canvasser app Able to read and
@@ -69,7 +70,7 @@
     records; able to add and update reference data
     generally.</documentation>
   </group>
-  <!--
+   <!--
     entity electors already has a key - not generating one
     -->
   <entity table="electors" name="electors" magnitude="6" volatility="5">
@@ -136,7 +137,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity genders already has a key - not generating one
     -->
   <entity table="genders" name="genders" magnitude="1" volatility="6">
@@ -164,7 +165,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity dwellings already has a key - not generating one
     -->
   <entity table="dwellings" name="dwellings" magnitude="6" volatility="6">
@@ -212,7 +213,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity addresses already has a key - not generating one
     -->
   <entity table="addresses" name="addresses" magnitude="6" volatility="6">
@@ -298,7 +299,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity visits already has a key - not generating one
     -->
   <entity table="visits" name="visits" magnitude="7" volatility="2">
@@ -361,7 +362,7 @@
     <permission permission="read" group="issueeditors"/>
     <permission permission="all" group="admin"/>
   </entity>
-  <!--
+   <!--
     entity authorities already has a key - not generating one
     -->
   <entity table="authorities" name="authorities" magnitude="2" volatility="7">
@@ -405,7 +406,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity issues already has a key - not generating one
     -->
   <entity table="issues" name="issues" magnitude="1" volatility="3">
@@ -648,7 +649,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity followuprequests already has a key - not generating one
     -->
   <entity table="followuprequests" name="followuprequests" magnitude="7" volatility="2">
@@ -709,7 +710,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="noedit"/>
   </entity>
-  <!--
+   <!--
     entity roles already has a key - not generating one
     -->
   <entity table="roles" name="roles" magnitude="1" volatility="7">
@@ -750,7 +751,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity teams already has a key - not generating one
     -->
   <entity table="teams" name="teams" magnitude="4" volatility="4">
@@ -926,7 +927,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity followupactions already has a key - not generating one
     -->
   <entity table="followupactions" name="followupactions" magnitude="7" volatility="0">
@@ -996,7 +997,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity options already has a key - not generating one
     -->
   <entity table="options" name="options" magnitude="1" volatility="7">
@@ -1024,7 +1025,7 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-  <!--
+   <!--
     entity followupmethods already has a key - not generating one
     -->
   <entity table="followupmethods" name="followupmethods" magnitude="1" volatility="7">
@@ -1051,4 +1052,4 @@
     <permission group="issueeditors" permission="read"/>
     <permission group="admin" permission="all"/>
   </entity>
-</application>
+</application>
\ No newline at end of file