Some changes to address Martin's comments.