update Ch6 classes