revisions after Martin's comments