revisions from ian
Merge branch 'revisions'