Addressed @yields review comments.