2014-06-30 Refactor Astar