Addressed another round's review comments.