Version 2.0 of Dijkstra