Addressed more review comments.