Bug fixes - use array instad of TArray - conserve memory