Continued work on AStar