Modified hierarchy a bit.