-- In this process I discovered a few missed sites in the old code. The new approach actually produces better HC results than the previous version.