update based on review comments.