reverting define to class