Updated based on CR comments.