Further codebook changes