CHG: several changes.