changed hierarchy setup