More changes CodeBook