Some tuning on the graph generation. Still some problem of 'self-preemption'.