Integrated reviewer's comments.