Updates to fix CN array.