Updated BBTree, updated Solver