Overhaul of TDFs in the works