substituing CADC with CANFAR in the right places