more changes to class