CHG: Speed and performance improvements