More work on HKPG CDF class