Changed Arrays to ArrayLists