V1.0 Beta 3 - fixed hierachy