Revert "Revert "more graph although its not finished""

This reverts commit 74242e78928201a3ef1cb3641d8b462d1d0c4e2c.