Amended per review comments.