Improved codebook