Minor changes in codebook