Use hybrid for now; remove DFM function