Merging TreeMakerV2 back into feature_smartBot