Added conditional A* organization