Reverted changed: back from static to dynamic array