dfgGraph refactored