changing to class methods