More modifications to codebook