Fixed up hierarchy.