Deals better with files