Dijkstra in progress
minor modification