WIP: enhance graph, (does not work yet)