Updated generalized CCD for better debugging info