although given that we removed subclassing, could probably just remove the second argument at this point.