reforked df2ca436