Changed from LinkedLists to ArrayLists