Part 2 of node bring up changes