Use grph for shortest path resolving
Improve