Improve codebook