New codebook and simplification of classes