Revisions from Martin's review
Revisions from Martin's review v02