Finish astar search part for 1.3