Added more to AStar