Updated based on review comments.