Chnaged the hierarchy of the figures