Pushing to separate AStar branch