Updated for review comments.