follow deep.nodes refactoring