changing hierarchy, trying to make more user friendly