Some changes
Imported from troot2