Some more work on dijkstra