changed from module to class