fixing messed up hierarchy again