Make it so we have a function and address CR comments.