Incorporating comments from Mark.