Incorporated comments from Matt.