Update to use current tree (hadron vectors, etc.)