changes to class definitions