Pulled changes from day11-astar branch