Incorporated comments from Brian.