Small modification on Codebook