CHG: Added more flexibility