Some Astar changes