A little adjustment to the order of node definition