updates for class 16.