updated for DFF 1.3.0