Update array
Merge Mike's changes