I propose to merge the refactored version that works with arrays back to master to make it the main version.