more codebook changes