Changed List to ArrayList at all instances