Changing to ROOT standards