Refactoring problem, with limited search + Astar started