Finished upgrades to hierarchy.