Updated based on some good comments.