minor ones
refactor node2