Updated code for CDCHC