Addressing huonw's comments.