Codebook revised