JG's suggested schema changes

 from email 25/02/14