Dijkstra's added, untested