Revised codebook again