More  changes to CodeBook