modified node hierarchy, removed unnecessary nodes.