Changes for 4-48 nodes