Codebook formatting changes