More changes
imported from troot2