Modified arrays to fix repeat calls