removed hierarchy, adjusted lengths