Make this a class method