Better tree building.. Need to do more tree :)