Updated codebook

something wrong while doing pull request
Fix unwrap issues