Move to format where node is passed in