Changes to node and Grid Generation