Reverted to class method