Changes suggested in review.