changed the hierachy