Final codebook changes