further changes to class stubs