cleared up hierarchy