Restructured array sizes
First full model