Update to be more in line with the array access patterns
Update to be more in line with the array access patterns