small changes
Merge remote-tracking branch 'origin/master'
Changed the arrays to come from the app Delegate