Change out looping through arrays to pulling them correctly