Rearranged hierarchy