more D2Fad optimizations