V2.0.1 Changed back to old 'toArray' logic which is more ugly but much faster