changed to class version