Cj branch

updates