Small revision to Codebook