integrated Martin's textual changes