Restructured for node