small changes to class