Final incorporation of comments from Meg