Made some changes on how we are getting the node, per Jonas