remake to class