add energy weighting, tree entries, etc.