Full tree search ok-minor changes