[HL] reworking hierarchy