CHG: design changes