added more to class definitions