Updated based on comment.