updated to new dfg stuff