Updates to AStar